From: Dan Williams Date: Fri, 11 May 2007 03:05:22 +0000 (-0400) Subject: [PATCH] libertas: remove SUPPORT_BOOT_COMMAND X-Git-Tag: v3.12-rc1~29568^2^2~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4f3465f80564e07a5756b11365cd24f9d693a9bb;p=kernel%2Fkernel-generic.git [PATCH] libertas: remove SUPPORT_BOOT_COMMAND Remove the static definition of SUPPORT_BOOT_COMMAND. Signed-off-by: Holger Schurig Acked-by: Dan Williams Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/libertas/Makefile b/drivers/net/wireless/libertas/Makefile index 19c9350..19e38d9 100644 --- a/drivers/net/wireless/libertas/Makefile +++ b/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/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c index 695fb6a..54853d8 100644 --- a/drivers/net/wireless/libertas/if_usb.c +++ b/drivers/net/wireless/libertas/if_usb.c @@ -775,7 +775,6 @@ restart: return -1; } -#ifdef SUPPORT_BOOT_COMMAND cardp->bootcmdresp = 0; do { int j = 0; @@ -796,7 +795,6 @@ restart: } return -1; } -#endif i = 0; priv->adapter->fw_ready = 0; diff --git a/drivers/net/wireless/libertas/if_usb.h b/drivers/net/wireless/libertas/if_usb.h index 7851167..170dfe6 100644 --- a/drivers/net/wireless/libertas/if_usb.h +++ b/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 {