summaryrefslogtreecommitdiffstats
path: root/arch/sparc/include/asm/pcic.h
diff options
context:
space:
mode:
authorJens Axboe <jaxboe@fusionio.com>2011-07-01 16:17:13 +0200
committerJens Axboe <jaxboe@fusionio.com>2011-07-01 16:17:13 +0200
commit04bf7869ca0fd12009aee301cac2264a36df4d98 (patch)
tree66cb81ebf8b76560a31433c2c493dc430c914af9 /arch/sparc/include/asm/pcic.h
parentblk-throttle: Make total_nr_queued unsigned (diff)
parentMerge branch 'for-3.0-important' of git://git.drbd.org/linux-2.6-drbd into fo... (diff)
downloadlinux-04bf7869ca0fd12009aee301cac2264a36df4d98.tar.xz
linux-04bf7869ca0fd12009aee301cac2264a36df4d98.zip
Merge branch 'for-linus' into for-3.1/core
Conflicts: block/blk-throttle.c block/cfq-iosched.c Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'arch/sparc/include/asm/pcic.h')
-rw-r--r--arch/sparc/include/asm/pcic.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/include/asm/pcic.h b/arch/sparc/include/asm/pcic.h
index 7eb5d78f5211..6676cbcc8b6a 100644
--- a/arch/sparc/include/asm/pcic.h
+++ b/arch/sparc/include/asm/pcic.h
@@ -29,7 +29,7 @@ struct linux_pcic {
int pcic_imdim;
};
-#ifdef CONFIG_PCI
+#ifdef CONFIG_PCIC_PCI
extern int pcic_present(void);
extern int pcic_probe(void);
extern void pci_time_init(void);