diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-08-05 11:56:39 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-08-05 11:56:39 +1000 |
| commit | d173604c97d13fad8cdb02c09826d00c66585fca (patch) | |
| tree | dae1c96c163f2c97246b08006915c95c255b1ff1 /drivers/pcmcia/Makefile | |
| parent | 0c1f7fadf938273b0d8e0457772dfe8e297ab208 (diff) | |
| parent | 127c03cdbad9bd5af5d7f33bd31a1015a90cb77f (diff) | |
Merge remote branch 'pcmcia/master'
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 d006e8beab9c..7a2b1604bf1c 100644 --- a/drivers/pcmcia/Makefile +++ b/drivers/pcmcia/Makefile @@ -7,7 +7,6 @@ pcmcia_core-$(CONFIG_CARDBUS) += cardbus.o obj-$(CONFIG_PCCARD) += pcmcia_core.o pcmcia-y += ds.o pcmcia_resource.o cistpl.o pcmcia_cis.o -pcmcia-$(CONFIG_PCMCIA_IOCTL) += pcmcia_ioctl.o obj-$(CONFIG_PCMCIA) += pcmcia.o pcmcia_rsrc-y += rsrc_mgr.o |