diff options
| author | Daniel Schaeffer <daniel@dschaeffer.localdomain> | 2008-02-04 09:46:45 -0500 |
|---|---|---|
| committer | Daniel Schaeffer <daniel@dschaeffer.localdomain> | 2008-02-04 09:46:45 -0500 |
| commit | ed4c3abaf2cf21cf2a75b9408acd0ff1dfe8e44e (patch) | |
| tree | e85486a6441879637638214e307a7b8c6ce5151f /drivers/pcmcia/Makefile | |
| parent | 00075ce10102d5754d13159157f4892d5a2a40e5 (diff) | |
FIxed merger error that was only symptomatic during "make clean"
Changes to be committed:
modified: drivers/pcmcia/Makefile
Diffstat (limited to 'drivers/pcmcia/Makefile')
| -rw-r--r-- | drivers/pcmcia/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile index 472e4f7ad090..8509609b3ba2 100644 --- a/drivers/pcmcia/Makefile +++ b/drivers/pcmcia/Makefile @@ -38,7 +38,7 @@ obj-$(CONFIG_PCMCIA_VRC4173) += vrc4173_cardu.o obj-$(CONFIG_OMAP_CF) += omap_cf.o obj-$(CONFIG_AT91_CF) += at91_cf.o obj-$(CONFIG_ELECTRA_CF) += electra_cf.o -obj-$(CONFIG_PCMCIA_MX31ADS) +obj-$(CONFIG_PCMCIA_MX31ADS) += mx31ads-pcmcia.o sa11xx_core-y += soc_common.o sa11xx_base.o pxa2xx_core-y += soc_common.o pxa2xx_base.o |