diff options
| author | Marcelo Tosatti <marcelo.tosatti@cyclades.com> | 2005-11-05 10:03:32 -0500 |
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2005-11-10 05:19:58 -0500 |
| commit | e34631508861237e598e7d72703eae4478761f37 (patch) | |
| tree | 3b2e7959ade92a501940619e6e0c8eae85f5ae83 /drivers/pcmcia/Kconfig | |
| parent | 5ab0b374943b3e42a391a3929e91616ef37dda90 (diff) | |
[PCMCIA] MPC8xx PCMCIA update
Kconfig entry: dependency on 8xx
Makefile: fix whitespace breakage
m8xx_pcmcia.c:
- asm/segment.h is gone
- use generic PCMCIA suspend/resume methods
Signed-off-by: Marcelo Tosatti <marcelo.tosatti@cyclades.com>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia/Kconfig')
| -rw-r--r-- | drivers/pcmcia/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig index ccf20039e909..309eb557f9a3 100644 --- a/drivers/pcmcia/Kconfig +++ b/drivers/pcmcia/Kconfig | |||
| @@ -156,7 +156,7 @@ config TCIC | |||
| 156 | 156 | ||
| 157 | config PCMCIA_M8XX | 157 | config PCMCIA_M8XX |
| 158 | tristate "MPC8xx PCMCIA support" | 158 | tristate "MPC8xx PCMCIA support" |
| 159 | depends on PCMCIA && PPC | 159 | depends on PCMCIA && PPC && 8xx |
| 160 | select PCCARD_NONSTATIC | 160 | select PCCARD_NONSTATIC |
| 161 | help | 161 | help |
| 162 | Say Y here to include support for PowerPC 8xx series PCMCIA | 162 | Say Y here to include support for PowerPC 8xx series PCMCIA |