Merge branch 'libertas' of git://git.kernel.org/pub/scm/linux/kernel/…

…git/linville/wireless-2.6 into upstream
git-mirror · May 11, 2007 · 17cf8cc · 17cf8cc
2 parents 12414db + 4269e2a
commit 17cf8cc
Show file tree

Hide file tree

Showing 22 changed files with 276 additions and 2,972 deletions.
diff --git a/drivers/net/wireless/libertas/Makefile b/drivers/net/wireless/libertas/Makefile
@@ -1,19 +1,10 @@
-# EXTRA_CFLAGS += -Wpacked
-
 usb8xxx-objs := main.o fw.o wext.o \
 		rx.o tx.o cmd.o 	  \
 		cmdresp.o scan.o	  \
 		join.o 11d.o 		  \
 		ioctl.o debugfs.o	  \
 		ethtool.o assoc.o
 
-ifeq ($(CONFIG_LIBERTAS_USB_DEBUG), y)
-EXTRA_CFLAGS += -DDEBUG -DPROC_DEBUG
-endif
-
-
-# This is needed to support the newer boot2 bootloader (v >= 3104)
-EXTRA_CFLAGS += -DSUPPORT_BOOT_COMMAND
 usb8xxx-objs += if_bootcmd.o
 usb8xxx-objs += if_usb.o