summaryrefslogtreecommitdiff
path: root/drivers/char/pcmcia/ipwireless/Makefile
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2010-12-10 17:19:18 +0300
committerJiri Kosina <jkosina@suse.cz>2010-12-10 17:19:18 +0300
commit2ade0c1d9d93b7642212657ef76f4a1e30233711 (patch)
tree63bc720c0ffe5f4760cac4ed617b9870b050175e /drivers/char/pcmcia/ipwireless/Makefile
parent504499f22c08a03e2e19dc88d31aa0ecd2ac815e (diff)
parent6313e3c21743cc88bb5bd8aa72948ee1e83937b6 (diff)
downloadlinux-2ade0c1d9d93b7642212657ef76f4a1e30233711.tar.xz
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/char/pcmcia/ipwireless/Makefile')
-rw-r--r--drivers/char/pcmcia/ipwireless/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/pcmcia/ipwireless/Makefile b/drivers/char/pcmcia/ipwireless/Makefile
index b71eb593643d..db80873d7f20 100644
--- a/drivers/char/pcmcia/ipwireless/Makefile
+++ b/drivers/char/pcmcia/ipwireless/Makefile
@@ -6,5 +6,5 @@
obj-$(CONFIG_IPWIRELESS) += ipwireless.o
-ipwireless-objs := hardware.o main.o network.o tty.o
+ipwireless-y := hardware.o main.o network.o tty.o