diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2006-01-12 13:54:20 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-01-12 20:09:30 +1100 |
| commit | ee2cdecec4dce8f7eb0d37a1bbf820cb32b2b75b (patch) | |
| tree | fa15ce75b9ae28bdea2352a8f80cb9df43f1322b /include/asm-powerpc | |
| parent | 511061049b2fab5ea684dfddcb8d2a38591391f3 (diff) | |
| download | op-kernel-dev-ee2cdecec4dce8f7eb0d37a1bbf820cb32b2b75b.zip op-kernel-dev-ee2cdecec4dce8f7eb0d37a1bbf820cb32b2b75b.tar.gz | |
[PATCH] powerpc: iSeries fixes for build with no PCI
This reverts part of "ppc64 iSeries: allow build with no PCI"
(145d01e4287b8cbf50f87c3283e33bf5c84e8468) which affected generic code
and applies a fix in the arch specific code.
Commit "partly merge iseries do_IRQ"
(5fee9b3b39eb55c7e3619a3b36ceeabffeb8f144) introduced iSeries_get_irq
which was only available if CONFIG_PCI is set.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-powerpc')
| -rw-r--r-- | include/asm-powerpc/iseries/iseries_io.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/asm-powerpc/iseries/iseries_io.h b/include/asm-powerpc/iseries/iseries_io.h index d1c317c..496aa85 100644 --- a/include/asm-powerpc/iseries/iseries_io.h +++ b/include/asm-powerpc/iseries/iseries_io.h @@ -32,6 +32,7 @@ * End Change Activity */ +#ifdef CONFIG_PCI extern u8 iSeries_Read_Byte(const volatile void __iomem * IoAddress); extern u16 iSeries_Read_Word(const volatile void __iomem * IoAddress); extern u32 iSeries_Read_Long(const volatile void __iomem * IoAddress); @@ -44,6 +45,17 @@ extern void iSeries_memcpy_toio(volatile void __iomem *dest, void *source, size_t n); extern void iSeries_memcpy_fromio(void *dest, const volatile void __iomem *source, size_t n); +#else +static inline u8 iSeries_Read_Byte(const volatile void __iomem *IoAddress) +{ + return 0xff; +} + +static inline void iSeries_Write_Byte(u8 IoData, + volatile void __iomem *IoAddress) +{ +} +#endif /* CONFIG_PCI */ #endif /* CONFIG_PPC_ISERIES */ #endif /* _ASM_POWERPC_ISERIES_ISERIES_IO_H */ |
