From 298e5c9a28c66af451e369f21a18c308166e49e0 Mon Sep 17 00:00:00 2001 From: Russell King Date: Mon, 21 Apr 2008 09:50:25 +0100 Subject: [PATCH] --- yaml --- r: 91959 b: refs/heads/master c: 99b56cad8d64279c075b4e1b0ca28347e3c5267a h: refs/heads/master i: 91957: 4172d8c9ace7b3dd7502993102f856c575551fac 91955: 5e6b2611d72611b9a1f3add76da1c052ffe5861b 91951: 73f431f5a2672788ada8584197e68ec757112e73 v: v3 --- [refs] | 2 +- trunk/drivers/pcmcia/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0b2d4432a730..05f2c9dc2aeb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d8d9075cf6023340a1603720a9a59815f14a5219 +refs/heads/master: 99b56cad8d64279c075b4e1b0ca28347e3c5267a diff --git a/trunk/drivers/pcmcia/Kconfig b/trunk/drivers/pcmcia/Kconfig index ed8c06904807..8d8852651fd2 100644 --- a/trunk/drivers/pcmcia/Kconfig +++ b/trunk/drivers/pcmcia/Kconfig @@ -200,7 +200,6 @@ config PCMCIA_AU1X00 config PCMCIA_SA1100 tristate "SA1100 support" depends on ARM && ARCH_SA1100 && PCMCIA - depends on ARCH_LUBBOCK || MACH_MAINSTONE || PXA_SHARPSL || MACH_ARMCORE help Say Y here to include support for SA11x0-based PCMCIA or CF sockets, found on HP iPAQs, Yopy, and other StrongARM(R)/ @@ -221,6 +220,7 @@ config PCMCIA_SA1111 config PCMCIA_PXA2XX tristate "PXA2xx support" depends on ARM && ARCH_PXA && PCMCIA + depends on ARCH_LUBBOCK || MACH_MAINSTONE || PXA_SHARPSL || MACH_ARMCORE help Say Y here to include support for the PXA2xx PCMCIA controller