From af0c1637c1b5825c81f019dd1a17e77ed9a8584b Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Thu, 10 May 2007 23:05:22 -0400
Subject: [PATCH] --- yaml --- r: 56247 b: refs/heads/master c:
 4f3465f80564e07a5756b11365cd24f9d693a9bb h: refs/heads/master i:   56245:
 01ba4c1915785fcd9478b3107727ac85d38069e1   56243:
 a6f8c94f249882fde8bb7f4bfd6cb8bc90949a1f   56239:
 c44a30fcf8642ee5d55e66c797a61bffa2eb876e v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/net/wireless/libertas/Makefile | 3 +--
 trunk/drivers/net/wireless/libertas/if_usb.c | 2 --
 trunk/drivers/net/wireless/libertas/if_usb.h | 2 --
 4 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index aae1ab20b825..7fa738118714 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b19fcc363e9d3886d45818ad72633d5f0cba88d
+refs/heads/master: 4f3465f80564e07a5756b11365cd24f9d693a9bb
diff --git a/trunk/drivers/net/wireless/libertas/Makefile b/trunk/drivers/net/wireless/libertas/Makefile
index 19c935071d8e..19e38d9e18e9 100644
--- a/trunk/drivers/net/wireless/libertas/Makefile
+++ b/trunk/drivers/net/wireless/libertas/Makefile
@@ -12,8 +12,7 @@ EXTRA_CFLAGS += -DDEBUG -DPROC_DEBUG
 endif
 
 
-# This is needed to support the newer boot2 bootloader (v >= 3104)
-EXTRA_CFLAGS += -DSUPPORT_BOOT_COMMAND
+#EXTRA_CFLAGS +=
 usb8xxx-objs += if_bootcmd.o
 usb8xxx-objs += if_usb.o
 
diff --git a/trunk/drivers/net/wireless/libertas/if_usb.c b/trunk/drivers/net/wireless/libertas/if_usb.c
index 695fb6a66ffe..54853d8ac5e1 100644
--- a/trunk/drivers/net/wireless/libertas/if_usb.c
+++ b/trunk/drivers/net/wireless/libertas/if_usb.c
@@ -775,7 +775,6 @@ int libertas_sbi_prog_firmware(wlan_private * priv)
 		return -1;
 	}
 
-#ifdef SUPPORT_BOOT_COMMAND
 	cardp->bootcmdresp = 0;
 	do {
 		int j = 0;
@@ -796,7 +795,6 @@ int libertas_sbi_prog_firmware(wlan_private * priv)
 		}
 		return -1;
 	}
-#endif
 
 	i = 0;
 	priv->adapter->fw_ready = 0;
diff --git a/trunk/drivers/net/wireless/libertas/if_usb.h b/trunk/drivers/net/wireless/libertas/if_usb.h
index 785116720bc6..170dfe6809f5 100644
--- a/trunk/drivers/net/wireless/libertas/if_usb.h
+++ b/trunk/drivers/net/wireless/libertas/if_usb.h
@@ -12,7 +12,6 @@
 #define USB8388_VID_2	0x05a3
 #define USB8388_PID_2	0x8388
 
-#ifdef SUPPORT_BOOT_COMMAND
 #define BOOT_CMD_FW_BY_USB     0x01
 #define BOOT_CMD_FW_IN_EEPROM  0x02
 #define BOOT_CMD_UPDATE_BOOT2  0x03
@@ -36,7 +35,6 @@ struct bootcmdrespStr
 	u8  u8result;
 	u8  au8dumy[2];
 };
-#endif /* SUPPORT_BOOT_COMMAND */
 
 /* read callback private data */
 struct read_cb_info {