Commit d8477126 authored Jun 05, 2014 by Arnd Bergmann Committed by Greg Kroah-Hartman Jul 09, 2014

pcmcia: sa1100: H3100 and H3600 share a driver



When building a iPAQ H3100-only kernel with PCMCIA enabled,
we get this build error:

ERROR: "pcmcia_h3600_init" [drivers/pcmcia/sa1100_cs.ko] undefined!

The defconfig normally works fine because it enables both H3100
and H3600 support. This patch fixes the Makefile to build the
driver if at least one of the two machines are selected.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 7a446d63

drivers/pcmcia/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -49,6 +49,7 @@ sa1100_cs-y += sa1100_generic.o
		sa1100_cs-$(CONFIG_SA1100_ASSABET) += sa1100_assabet.o
		sa1100_cs-$(CONFIG_SA1100_CERF) += sa1100_cerf.o
		sa1100_cs-$(CONFIG_SA1100_COLLIE) += pxa2xx_sharpsl.o
		sa1100_cs-$(CONFIG_SA1100_H3100) += sa1100_h3600.o
		sa1100_cs-$(CONFIG_SA1100_H3600) += sa1100_h3600.o
		sa1100_cs-$(CONFIG_SA1100_NANOENGINE) += sa1100_nanoengine.o
		sa1100_cs-$(CONFIG_SA1100_SHANNON) += sa1100_shannon.o

Admin message