diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-11-03 15:49:01 +0100 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-11-03 15:49:01 +0100 |
| commit | e856359685143a2f65876e7db4e4aa0ef5dce7f0 (patch) | |
| tree | bbcafe7f23975979f7a2bc6fd1404908d5fd7bd1 /drivers/pcmcia/Makefile | |
| parent | [ARM] S3C24XX: Move mci.h to arch/arm/plat-s3c24xx/include/plat (diff) | |
| parent | Linux v2.6.28-rc3 (diff) | |
| download | linux-e856359685143a2f65876e7db4e4aa0ef5dce7f0.tar.xz linux-e856359685143a2f65876e7db4e4aa0ef5dce7f0.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into s3c-moves2
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 obj-$(CONFIG_I82092) += i82092.o obj-$(CONFIG_TCIC) += tcic.o obj-$(CONFIG_PCMCIA_M8XX) += m8xx_pcmcia.o -obj-$(CONFIG_HD64465_PCMCIA) += hd64465_ss.o obj-$(CONFIG_PCMCIA_SA1100) += sa11xx_core.o sa1100_cs.o obj-$(CONFIG_PCMCIA_SA1111) += sa11xx_core.o sa1111_cs.o obj-$(CONFIG_M32R_PCC) += m32r_pcc.o |