diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/char/pcmcia/Makefile | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/char/pcmcia/Makefile')
| -rw-r--r-- | drivers/char/pcmcia/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/char/pcmcia/Makefile b/drivers/char/pcmcia/Makefile index be8f287aa398..0aae20985d57 100644 --- a/drivers/char/pcmcia/Makefile +++ b/drivers/char/pcmcia/Makefile | |||
| @@ -4,8 +4,6 @@ | |||
| 4 | # Makefile for the Linux PCMCIA char device drivers. | 4 | # Makefile for the Linux PCMCIA char device drivers. |
| 5 | # | 5 | # |
| 6 | 6 | ||
| 7 | obj-y += ipwireless/ | ||
| 8 | |||
| 9 | obj-$(CONFIG_SYNCLINK_CS) += synclink_cs.o | 7 | obj-$(CONFIG_SYNCLINK_CS) += synclink_cs.o |
| 10 | obj-$(CONFIG_CARDMAN_4000) += cm4000_cs.o | 8 | obj-$(CONFIG_CARDMAN_4000) += cm4000_cs.o |
| 11 | obj-$(CONFIG_CARDMAN_4040) += cm4040_cs.o | 9 | obj-$(CONFIG_CARDMAN_4040) += cm4040_cs.o |