diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2009-10-05 09:30:10 +0200 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-10-05 09:30:10 +0200 |
| commit | 5d13379a4dba717fb75b749acc0f928c2c02db17 (patch) | |
| tree | ab5bf870206e6ea8e744390cdb37cb14f7e78257 /drivers/pcmcia/Kconfig | |
| parent | 08dc8726d4be85bca793141c827574fd32a681bb (diff) | |
| parent | 374576a8b6f865022c0fd1ca62396889b23d66dd (diff) | |
| download | kernel_samsung_tuna-5d13379a4dba717fb75b749acc0f928c2c02db17.zip kernel_samsung_tuna-5d13379a4dba717fb75b749acc0f928c2c02db17.tar.gz kernel_samsung_tuna-5d13379a4dba717fb75b749acc0f928c2c02db17.tar.bz2 | |
Merge branch 'master' into for-2.6.33
Diffstat (limited to 'drivers/pcmcia/Kconfig')
| -rw-r--r-- | drivers/pcmcia/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig index fbf965b..17f38a7 100644 --- a/drivers/pcmcia/Kconfig +++ b/drivers/pcmcia/Kconfig @@ -192,6 +192,10 @@ config PCMCIA_AU1X00 tristate "Au1x00 pcmcia support" depends on SOC_AU1X00 && PCMCIA +config PCMCIA_BCM63XX + tristate "bcm63xx pcmcia support" + depends on BCM63XX && PCMCIA + config PCMCIA_SA1100 tristate "SA1100 support" depends on ARM && ARCH_SA1100 && PCMCIA |