From 33ff8e01597f598c9f6e7dec7eb58d18e6c801d7 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Thu, 10 May 2007 23:05:55 -0400
Subject: [PATCH] --- yaml --- r: 56248 b: refs/heads/master c:
 3a8b9a4a6b4e7cfd147f94f5772641a34e12efe4 h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/net/wireless/libertas/Makefile | 8 --------
 trunk/drivers/net/wireless/libertas/defs.h   | 5 +++++
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 7fa738118714..5b8878aa8ffe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f3465f80564e07a5756b11365cd24f9d693a9bb
+refs/heads/master: 3a8b9a4a6b4e7cfd147f94f5772641a34e12efe4
diff --git a/trunk/drivers/net/wireless/libertas/Makefile b/trunk/drivers/net/wireless/libertas/Makefile
index 19e38d9e18e9..56a8ea1fbf04 100644
--- a/trunk/drivers/net/wireless/libertas/Makefile
+++ b/trunk/drivers/net/wireless/libertas/Makefile
@@ -1,5 +1,3 @@
-# EXTRA_CFLAGS += -Wpacked
-
 usb8xxx-objs := main.o fw.o wext.o \
 		rx.o tx.o cmd.o 	  \
 		cmdresp.o scan.o	  \
@@ -7,12 +5,6 @@ usb8xxx-objs := main.o fw.o wext.o \
 		ioctl.o debugfs.o	  \
 		ethtool.o assoc.o
 
-ifeq ($(CONFIG_LIBERTAS_USB_DEBUG), y)
-EXTRA_CFLAGS += -DDEBUG -DPROC_DEBUG
-endif
-
-
-#EXTRA_CFLAGS +=
 usb8xxx-objs += if_bootcmd.o
 usb8xxx-objs += if_usb.o
 
diff --git a/trunk/drivers/net/wireless/libertas/defs.h b/trunk/drivers/net/wireless/libertas/defs.h
index 9156bbc53a38..80dd9ea19c8e 100644
--- a/trunk/drivers/net/wireless/libertas/defs.h
+++ b/trunk/drivers/net/wireless/libertas/defs.h
@@ -9,6 +9,11 @@
 
 extern unsigned int libertas_debug;
 
+#ifdef CONFIG_LIBERTAS_DEBUG
+#define DEBUG
+#define PROC_DEBUG
+#endif
+
 #define DRV_NAME		"usb8xxx"
 
 #define lbs_pr_info(format, args...) \