diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-06-05 23:05:49 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-09 23:41:30 +0200 |
| commit | d8477126f46b036b26d95b127689a3774a080e34 (patch) | |
| tree | b798f35662638f447bdb99a1766a2d528de0aea3 /drivers/pcmcia/Makefile | |
| parent | hyperv: remove meaningless pr_err() in vmbus_recvpacket_raw() (diff) | |
| download | linux-d8477126f46b036b26d95b127689a3774a080e34.tar.xz linux-d8477126f46b036b26d95b127689a3774a080e34.zip | |
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>
Diffstat (limited to 'drivers/pcmcia/Makefile')
| -rw-r--r-- | drivers/pcmcia/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile index 7745b512a87c..fd55a6951402 100644 --- a/drivers/pcmcia/Makefile +++ b/drivers/pcmcia/Makefile @@ -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 |