Update compat.diff to match latest wireless-2.6#everything pull. Libertas ethtool

stuff was renamed.

Signed-off-by: Luis R. Rodriguez <mcgrof@winlab.rutgers.edu>

2 files changed, 31 insertions, 31 deletions

diff --git a/compat/compat.diff b/compat/compat.diff
index 0b93241..257e035 100644
--- a/compat/compat.diff
+++ b/compat/compat.diff
@@ -510,6 +510,26 @@
  obj-$(CONFIG_LIBERTAS)		+= libertas/
  
  rtl8180-objs		:= rtl8180_dev.o rtl8180_rtl8225.o
+--- a/drivers/misc/Makefile	2007-11-15 22:15:29.000000000 -0500
++++ b/drivers/misc/Makefile	2007-11-15 22:15:45.000000000 -0500
+@@ -3,17 +3,4 @@
+ #
+ obj- := misc.o	# Dummy rule to force built-in.o to be made
+ 
+-obj-$(CONFIG_IBM_ASM)		+= ibmasm/
+-obj-$(CONFIG_HDPU_FEATURES)	+= hdpuftrs/
+-obj-$(CONFIG_MSI_LAPTOP)     += msi-laptop.o
+-obj-$(CONFIG_ASUS_LAPTOP)     += asus-laptop.o
+-obj-$(CONFIG_ATMEL_SSC)		+= atmel-ssc.o
+-obj-$(CONFIG_LKDTM)		+= lkdtm.o
+-obj-$(CONFIG_TIFM_CORE)       	+= tifm_core.o
+-obj-$(CONFIG_TIFM_7XX1)       	+= tifm_7xx1.o
+-obj-$(CONFIG_PHANTOM)		+= phantom.o
+-obj-$(CONFIG_SGI_IOC4)		+= ioc4.o
+-obj-$(CONFIG_SONY_LAPTOP)	+= sony-laptop.o
+-obj-$(CONFIG_THINKPAD_ACPI)	+= thinkpad_acpi.o
+-obj-$(CONFIG_FUJITSU_LAPTOP)	+= fujitsu-laptop.o
+ obj-$(CONFIG_EEPROM_93CX6)	+= eeprom_93cx6.o
 --- a/drivers/net/wireless/libertas/dev.h	2007-11-15 20:19:33.000000000 -0500
 +++ b/drivers/net/wireless/libertas/dev.h	2007-11-15 20:27:51.000000000 -0500
 @@ -11,6 +11,7 @@
@@ -520,14 +540,14 @@
  
  #include "defs.h"
  #include "scan.h"
---- a/drivers/net/wireless/libertas/ethtool.c	2007-11-15 20:41:59.000000000 -0500
-+++ b/drivers/net/wireless/libertas/ethtool.c	2007-11-15 20:44:28.000000000 -0500
+--- a/drivers/net/wireless/libertas/ethtool.c	2007-11-16 19:05:35.000000000 -0500
++++ b/drivers/net/wireless/libertas/ethtool.c	2007-11-16 19:06:41.000000000 -0500
 @@ -143,6 +143,7 @@
  	lbs_deb_enter(LBS_DEB_ETHTOOL);
  }
  
 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24))
- static int libertas_ethtool_get_sset_count(struct net_device * dev, int sset)
+ static int lbs_ethtool_get_sset_count(struct net_device * dev, int sset)
  {
  	switch (sset) {
 @@ -152,6 +153,7 @@
@@ -536,35 +556,15 @@
  }
 +#endif
  
- static void libertas_ethtool_get_strings (struct net_device * dev,
+ static void lbs_ethtool_get_strings(struct net_device *dev,
  					  u32 stringset,
 @@ -177,7 +179,9 @@
- 	.get_drvinfo = libertas_ethtool_get_drvinfo,
- 	.get_eeprom =  libertas_ethtool_get_eeprom,
- 	.get_eeprom_len = libertas_ethtool_get_eeprom_len,
+ 	.get_drvinfo = lbs_ethtool_get_drvinfo,
+ 	.get_eeprom =  lbs_ethtool_get_eeprom,
+ 	.get_eeprom_len = lbs_ethtool_get_eeprom_len,
 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24))
- 	.get_sset_count = libertas_ethtool_get_sset_count,
+ 	.get_sset_count = lbs_ethtool_get_sset_count,
 +#endif
- 	.get_ethtool_stats = libertas_ethtool_get_stats,
- 	.get_strings = libertas_ethtool_get_strings,
+ 	.get_ethtool_stats = lbs_ethtool_get_stats,
+ 	.get_strings = lbs_ethtool_get_strings,
  };
---- a/drivers/misc/Makefile	2007-11-15 22:15:29.000000000 -0500
-+++ b/drivers/misc/Makefile	2007-11-15 22:15:45.000000000 -0500
-@@ -3,17 +3,4 @@
- #
- obj- := misc.o	# Dummy rule to force built-in.o to be made
- 
--obj-$(CONFIG_IBM_ASM)		+= ibmasm/
--obj-$(CONFIG_HDPU_FEATURES)	+= hdpuftrs/
--obj-$(CONFIG_MSI_LAPTOP)     += msi-laptop.o
--obj-$(CONFIG_ASUS_LAPTOP)     += asus-laptop.o
--obj-$(CONFIG_ATMEL_SSC)		+= atmel-ssc.o
--obj-$(CONFIG_LKDTM)		+= lkdtm.o
--obj-$(CONFIG_TIFM_CORE)       	+= tifm_core.o
--obj-$(CONFIG_TIFM_7XX1)       	+= tifm_7xx1.o
--obj-$(CONFIG_PHANTOM)		+= phantom.o
--obj-$(CONFIG_SGI_IOC4)		+= ioc4.o
--obj-$(CONFIG_SONY_LAPTOP)	+= sony-laptop.o
--obj-$(CONFIG_THINKPAD_ACPI)	+= thinkpad_acpi.o
--obj-$(CONFIG_FUJITSU_LAPTOP)	+= fujitsu-laptop.o
- obj-$(CONFIG_EEPROM_93CX6)	+= eeprom_93cx6.o
diff --git a/scripts/unload.sh b/scripts/unload.sh
index 1ee5f78..c195bc3 100755
--- a/scripts/unload.sh
+++ b/scripts/unload.sh
@@ -2,7 +2,7 @@
 
 # The old stack drivers and the mac80211 rc80211_simple modules 
 # which is no longer on recent kernels (its internal)
-OLD_MODULES="zd1211rw rc80211_simple"
+OLD_MODULES="zd1211rw bcm43xx rc80211_simple"
 MODULES="$OLD_MODULES"
 MODULES="$MODULES adm8211"
 MODULES="$MODULES b43 b43legacy"