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 /drivers/pcmcia/Kconfig | |
| parent | 4eb6bf6bfb580afaf1e1a1d30cba17a078530cf4 (diff) | |
| parent | 93ab471889c6662b42ce7da257f31f24c08d7d9e (diff) | |
Merge branch 'for-2.6.23' into merge
Diffstat (limited to 'drivers/pcmcia/Kconfig')
| -rw-r--r-- | drivers/pcmcia/Kconfig | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig index 35f88649d3b7..c0c77f82d051 100644 --- a/drivers/pcmcia/Kconfig +++ b/drivers/pcmcia/Kconfig | |||
| @@ -180,14 +180,15 @@ config TCIC | |||
| 180 | PCMCIA cards are plugged into. If unsure, say N. | 180 | PCMCIA cards are plugged into. If unsure, say N. |
| 181 | 181 | ||
| 182 | config PCMCIA_M8XX | 182 | config PCMCIA_M8XX |
| 183 | tristate "MPC8xx PCMCIA support" | 183 | tristate "MPC8xx PCMCIA support" |
| 184 | depends on PCMCIA && PPC && 8xx | 184 | depends on PCMCIA && PPC && 8xx |
| 185 | select PCCARD_IODYN | 185 | select PCCARD_IODYN |
| 186 | help | 186 | select PCCARD_NONSTATIC |
| 187 | Say Y here to include support for PowerPC 8xx series PCMCIA | 187 | help |
| 188 | controller. | 188 | Say Y here to include support for PowerPC 8xx series PCMCIA |
| 189 | 189 | controller. | |
| 190 | This driver is also available as a module called m8xx_pcmcia. | 190 | |
| 191 | This driver is also available as a module called m8xx_pcmcia. | ||
| 191 | 192 | ||
| 192 | config HD64465_PCMCIA | 193 | config HD64465_PCMCIA |
| 193 | tristate "HD64465 host bridge support" | 194 | tristate "HD64465 host bridge support" |