diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-24 01:52:47 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-24 01:52:47 -0400 |
| commit | 23930fa1cebfea6f79881c588ccd1b0781e49e3f (patch) | |
| tree | 36d29e3f83661c4f5f45b6f74ac0d5f9886867a8 /include/asm-ppc/mpc8260_pci9.h | |
| parent | 36b35a5be0e4b406acd816e2122d153e875105be (diff) | |
| parent | 4f5537de7c1531398e84e18a24f667e49cc94208 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'include/asm-ppc/mpc8260_pci9.h')
| -rw-r--r-- | include/asm-ppc/mpc8260_pci9.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/asm-ppc/mpc8260_pci9.h b/include/asm-ppc/mpc8260_pci9.h index 26b3f6e787bc..9f7176881c56 100644 --- a/include/asm-ppc/mpc8260_pci9.h +++ b/include/asm-ppc/mpc8260_pci9.h | |||
| @@ -30,8 +30,6 @@ | |||
| 30 | #undef inb | 30 | #undef inb |
| 31 | #undef inw | 31 | #undef inw |
| 32 | #undef inl | 32 | #undef inl |
| 33 | #undef insw_ns | ||
| 34 | #undef insl_ns | ||
| 35 | #undef memcpy_fromio | 33 | #undef memcpy_fromio |
| 36 | 34 | ||
| 37 | extern int readb(volatile unsigned char *addr); | 35 | extern int readb(volatile unsigned char *addr); |
| @@ -43,8 +41,6 @@ extern void insl(unsigned port, void *buf, int nl); | |||
| 43 | extern int inb(unsigned port); | 41 | extern int inb(unsigned port); |
| 44 | extern int inw(unsigned port); | 42 | extern int inw(unsigned port); |
| 45 | extern unsigned inl(unsigned port); | 43 | extern unsigned inl(unsigned port); |
| 46 | extern void insw_ns(unsigned port, void *buf, int ns); | ||
| 47 | extern void insl_ns(unsigned port, void *buf, int nl); | ||
| 48 | extern void *memcpy_fromio(void *dest, unsigned long src, size_t count); | 44 | extern void *memcpy_fromio(void *dest, unsigned long src, size_t count); |
| 49 | 45 | ||
| 50 | #endif /* !__CONFIG_8260_PCI9_DEFS */ | 46 | #endif /* !__CONFIG_8260_PCI9_DEFS */ |