diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-08 14:23:02 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-08 14:23:02 -0500 |
| commit | 895e031707954a9ca26ed4f5f794575313854ed1 (patch) | |
| tree | ec7cd5515f346e6f94bc43e63d55ebc8ddf4173d /drivers/pcmcia/Makefile | |
| parent | 838e8bb71dc0c892bf8f84abd3c709d8fe3a8d3c (diff) | |
| parent | a622cf69b806bbb1887913c04e01d0c25b892876 (diff) | |
Merge branch 'linus' into x86/cleanups
Diffstat (limited to 'drivers/pcmcia/Makefile')
| -rw-r--r-- | drivers/pcmcia/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile index 23e492bf75cf..238629ad7f7c 100644 --- a/drivers/pcmcia/Makefile +++ b/drivers/pcmcia/Makefile | |||
| @@ -22,7 +22,6 @@ obj-$(CONFIG_I82365) += i82365.o | |||
| 22 | obj-$(CONFIG_I82092) += i82092.o | 22 | obj-$(CONFIG_I82092) += i82092.o |
| 23 | obj-$(CONFIG_TCIC) += tcic.o | 23 | obj-$(CONFIG_TCIC) += tcic.o |
| 24 | obj-$(CONFIG_PCMCIA_M8XX) += m8xx_pcmcia.o | 24 | obj-$(CONFIG_PCMCIA_M8XX) += m8xx_pcmcia.o |
| 25 | obj-$(CONFIG_HD64465_PCMCIA) += hd64465_ss.o | ||
| 26 | obj-$(CONFIG_PCMCIA_SA1100) += sa11xx_core.o sa1100_cs.o | 25 | obj-$(CONFIG_PCMCIA_SA1100) += sa11xx_core.o sa1100_cs.o |
| 27 | obj-$(CONFIG_PCMCIA_SA1111) += sa11xx_core.o sa1111_cs.o | 26 | obj-$(CONFIG_PCMCIA_SA1111) += sa11xx_core.o sa1111_cs.o |
| 28 | obj-$(CONFIG_M32R_PCC) += m32r_pcc.o | 27 | obj-$(CONFIG_M32R_PCC) += m32r_pcc.o |