summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/Makefile
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-01-17 22:43:20 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-02-21 14:27:18 +0000
commit11990b2b28dc6785c53c95b2a8f1d8605602a233 (patch)
tree94a6987d3a07a288ab527f7c151c9e9c95226c16 /drivers/pcmcia/Makefile
parent136b758bbb12348db08aca7d7dd96a12db4b23f0 (diff)
downloadop-kernel-dev-11990b2b28dc6785c53c95b2a8f1d8605602a233.zip
op-kernel-dev-11990b2b28dc6785c53c95b2a8f1d8605602a233.tar.gz
PCMCIA: make lubbock socket driver part of sa1111_cs
Lubbock is just another SA1111 socket driver, so now that Kconfig has better control of which files get built, we can sanitize the build for this. Acked-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/pcmcia/Makefile')
-rw-r--r--drivers/pcmcia/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile
index 05136dd..49d79f7 100644
--- a/drivers/pcmcia/Makefile
+++ b/drivers/pcmcia/Makefile
@@ -43,6 +43,7 @@ sa1111_cs-y += sa1111_generic.o
sa1111_cs-$(CONFIG_ASSABET_NEPONSET) += sa1100_neponset.o
sa1111_cs-$(CONFIG_SA1100_BADGE4) += sa1100_badge4.o
sa1111_cs-$(CONFIG_SA1100_JORNADA720) += sa1100_jornada720.o
+sa1111_cs-$(CONFIG_ARCH_LUBBOCK) += pxa2xx_lubbock.o
sa1100_cs-y += sa1100_generic.o
sa1100_cs-$(CONFIG_SA1100_ASSABET) += sa1100_assabet.o
@@ -53,9 +54,7 @@ sa1100_cs-$(CONFIG_SA1100_NANOENGINE) += sa1100_nanoengine.o
sa1100_cs-$(CONFIG_SA1100_SHANNON) += sa1100_shannon.o
sa1100_cs-$(CONFIG_SA1100_SIMPAD) += sa1100_simpad.o
-pxa2xx_lubbock_cs-y += pxa2xx_lubbock.o sa1111_generic.o
pxa2xx_cm_x2xx_cs-y += pxa2xx_cm_x2xx.o pxa2xx_cm_x255.o pxa2xx_cm_x270.o
-pxa2xx-obj-$(CONFIG_ARCH_LUBBOCK) += pxa2xx_lubbock_cs.o
pxa2xx-obj-$(CONFIG_MACH_MAINSTONE) += pxa2xx_mainstone.o
pxa2xx-obj-$(CONFIG_PXA_SHARPSL) += pxa2xx_sharpsl.o
pxa2xx-obj-$(CONFIG_MACH_ARMCORE) += pxa2xx_cm_x2xx_cs.o
OpenPOWER on IntegriCloud