[PATCH] remove SUPPORT_BOOT_COMMAND
Holger Schurig
hs4233 at mail.mn-solutions.de
Tue Feb 13 07:56:53 EST 2007
Remove the static definition of SUPPORT_BOOT_COMMAND.
Signed-off-by: Holger Schurig <hs4233 at mail.mn-solutions.de>
---
This makes the makefile simpler for the split into libertas.ko and usb8xxx.ko.
Another option would be to put a #define SUPPORT_BOOT_COMMAND into if_usb.h.
--- libertas-2.6.orig/drivers/net/wireless/libertas/Makefile
+++ libertas-2.6/drivers/net/wireless/libertas/Makefile
@@ -13,7 +13,6 @@
# 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
--- libertas-2.6.orig/drivers/net/wireless/libertas/if_usb.h
+++ libertas-2.6/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 @@
u8 u8result;
u8 au8dumy[2];
};
-#endif /* SUPPORT_BOOT_COMMAND */
/* read callback private data */
struct read_cb_info {
--- libertas-2.6.orig/drivers/net/wireless/libertas/if_usb.c
+++ libertas-2.6/drivers/net/wireless/libertas/if_usb.c
@@ -775,7 +775,6 @@
return -1;
}
-#ifdef SUPPORT_BOOT_COMMAND
cardp->bootcmdresp = 0;
do {
int j = 0;
@@ -796,7 +795,6 @@
}
return -1;
}
-#endif
i = 0;
priv->adapter->fw_ready = 0;
More information about the libertas-dev
mailing list