diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-06-22 02:15:52 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-22 03:46:31 +0200 |
| commit | 145d01e4287b8cbf50f87c3283e33bf5c84e8468 (patch) | |
| tree | 368786294f6cf7b8b909aceaac8cc4d90be2ab7d /arch/ppc64/kernel/sys_ppc32.c | |
| parent | [PATCH] ppc64 iSeries: tidy up irq code after merge (diff) | |
| download | linux-145d01e4287b8cbf50f87c3283e33bf5c84e8468.tar.xz linux-145d01e4287b8cbf50f87c3283e33bf5c84e8468.zip | |
[PATCH] ppc64 iSeries: allow build with no PCI
This patch allows iSeries to build with CONFIG_PCI=n. This is useful for
partitions that have only virtual I/O.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/ppc64/kernel/sys_ppc32.c')
| -rw-r--r-- | arch/ppc64/kernel/sys_ppc32.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/ppc64/kernel/sys_ppc32.c b/arch/ppc64/kernel/sys_ppc32.c index 9c8e317c598d..118436e8085a 100644 --- a/arch/ppc64/kernel/sys_ppc32.c +++ b/arch/ppc64/kernel/sys_ppc32.c @@ -741,6 +741,7 @@ asmlinkage int sys32_pciconfig_write(u32 bus, u32 dfn, u32 off, u32 len, u32 ubu asmlinkage int sys32_pciconfig_iobase(u32 which, u32 in_bus, u32 in_devfn) { +#ifdef CONFIG_PCI struct pci_controller* hose; struct list_head *ln; struct pci_bus *bus = NULL; @@ -786,7 +787,7 @@ asmlinkage int sys32_pciconfig_iobase(u32 which, u32 in_bus, u32 in_devfn) case IOBASE_ISA_MEM: return -EINVAL; } - +#endif /* CONFIG_PCI */ return -EOPNOTSUPP; } |