diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-07-10 23:28:26 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-07-10 23:28:26 -0400 |
| commit | bf22f6fe2d72b4d7e9035be8ceb340414cf490e3 (patch) | |
| tree | 14085d90de0428316479fe6de8a0c6d32e6e65e2 /include/asm-powerpc/mpc8xx.h | |
| parent | 4eb6bf6bfb580afaf1e1a1d30cba17a078530cf4 (diff) | |
| parent | 93ab471889c6662b42ce7da257f31f24c08d7d9e (diff) | |
Merge branch 'for-2.6.23' into merge
Diffstat (limited to 'include/asm-powerpc/mpc8xx.h')
| -rw-r--r-- | include/asm-powerpc/mpc8xx.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-powerpc/mpc8xx.h b/include/asm-powerpc/mpc8xx.h index 580371120e1a..2be014b6f57c 100644 --- a/include/asm-powerpc/mpc8xx.h +++ b/include/asm-powerpc/mpc8xx.h | |||
| @@ -23,6 +23,10 @@ | |||
| 23 | #include <platforms/8xx/mpc885ads.h> | 23 | #include <platforms/8xx/mpc885ads.h> |
| 24 | #endif | 24 | #endif |
| 25 | 25 | ||
| 26 | #ifdef CONFIG_PCMCIA_M8XX | ||
| 27 | extern struct mpc8xx_pcmcia_ops m8xx_pcmcia_ops; | ||
| 28 | #endif | ||
| 29 | |||
| 26 | #endif /* CONFIG_8xx */ | 30 | #endif /* CONFIG_8xx */ |
| 27 | #endif /* __CONFIG_8xx_DEFS */ | 31 | #endif /* __CONFIG_8xx_DEFS */ |
| 28 | #endif /* __KERNEL__ */ | 32 | #endif /* __KERNEL__ */ |