rpms/kernel/devel linux-2.6-wireless-pending.patch,1.43,1.44

John W. Linville (linville) fedora-extras-commits at redhat.com
Tue Apr 8 04:17:39 UTC 2008


Author: linville

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15253

Modified Files:
	linux-2.6-wireless-pending.patch 
Log Message:
fix kconfig issue in linux-2.6-wireless-pending.patch

linux-2.6-wireless-pending.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.43 -r 1.44 linux-2.6-wireless-pending.patch
Index: linux-2.6-wireless-pending.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-wireless-pending.patch,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- linux-2.6-wireless-pending.patch	8 Apr 2008 03:38:38 -0000	1.43
+++ linux-2.6-wireless-pending.patch	8 Apr 2008 04:17:20 -0000	1.44
@@ -5468,8 +5468,8 @@
     Signed-off-by: John W. Linville <linville at tuxdriver.com>
 
 diff -up linux-2.6.24.noarch/include/linux/nl80211.h.orig linux-2.6.24.noarch/include/linux/nl80211.h
---- linux-2.6.24.noarch/include/linux/nl80211.h.orig	2008-04-07 23:22:03.000000000 -0400
-+++ linux-2.6.24.noarch/include/linux/nl80211.h	2008-04-07 23:33:46.000000000 -0400
+--- linux-2.6.24.noarch/include/linux/nl80211.h.orig	2008-04-08 00:15:25.000000000 -0400
++++ linux-2.6.24.noarch/include/linux/nl80211.h	2008-04-08 00:15:32.000000000 -0400
 @@ -78,6 +78,18 @@
   *	or, if no MAC address given, all stations, on the interface identified
   *	by %NL80211_ATTR_IFINDEX.
@@ -5749,8 +5749,8 @@
  
  #endif /* __LINUX_NL80211_H */
 diff -up linux-2.6.24.noarch/include/linux/wireless.h.orig linux-2.6.24.noarch/include/linux/wireless.h
---- linux-2.6.24.noarch/include/linux/wireless.h.orig	2008-04-07 23:22:04.000000000 -0400
-+++ linux-2.6.24.noarch/include/linux/wireless.h	2008-04-07 23:33:46.000000000 -0400
+--- linux-2.6.24.noarch/include/linux/wireless.h.orig	2008-04-08 00:15:25.000000000 -0400
++++ linux-2.6.24.noarch/include/linux/wireless.h	2008-04-08 00:15:32.000000000 -0400
 @@ -455,6 +455,7 @@
  #define IW_MODE_REPEAT	4	/* Wireless Repeater (forwarder) */
  #define IW_MODE_SECOND	5	/* Secondary master/repeater (backup) */
@@ -5760,8 +5760,8 @@
  /* Statistics flags (bitmask in updated) */
  #define IW_QUAL_QUAL_UPDATED	0x01	/* Value was updated since last read */
 diff -up linux-2.6.24.noarch/include/linux/ieee80211.h.orig linux-2.6.24.noarch/include/linux/ieee80211.h
---- linux-2.6.24.noarch/include/linux/ieee80211.h.orig	2008-04-07 23:22:02.000000000 -0400
-+++ linux-2.6.24.noarch/include/linux/ieee80211.h	2008-04-07 23:33:46.000000000 -0400
+--- linux-2.6.24.noarch/include/linux/ieee80211.h.orig	2008-04-08 00:15:25.000000000 -0400
++++ linux-2.6.24.noarch/include/linux/ieee80211.h	2008-04-08 00:15:32.000000000 -0400
 @@ -97,6 +97,7 @@
  #define IEEE80211_MAX_FRAME_LEN		2352
  
@@ -5826,8 +5826,8 @@
  	WLAN_EID_PWR_CONSTRAINT = 32,
  	WLAN_EID_PWR_CAPABILITY = 33,
 diff -up linux-2.6.24.noarch/include/linux/ssb/ssb_driver_chipcommon.h.orig linux-2.6.24.noarch/include/linux/ssb/ssb_driver_chipcommon.h
---- linux-2.6.24.noarch/include/linux/ssb/ssb_driver_chipcommon.h.orig	2008-04-07 23:22:03.000000000 -0400
-+++ linux-2.6.24.noarch/include/linux/ssb/ssb_driver_chipcommon.h	2008-04-07 23:33:46.000000000 -0400
+--- linux-2.6.24.noarch/include/linux/ssb/ssb_driver_chipcommon.h.orig	2008-04-08 00:15:25.000000000 -0400
++++ linux-2.6.24.noarch/include/linux/ssb/ssb_driver_chipcommon.h	2008-04-08 00:15:32.000000000 -0400
 @@ -390,6 +390,10 @@ extern void ssb_chipco_set_clockmode(str
  extern void ssb_chipco_watchdog_timer_set(struct ssb_chipcommon *cc,
  					  u32 ticks);
@@ -5840,8 +5840,8 @@
  u32 ssb_chipco_gpio_in(struct ssb_chipcommon *cc, u32 mask);
  u32 ssb_chipco_gpio_out(struct ssb_chipcommon *cc, u32 mask, u32 value);
 diff -up /dev/null linux-2.6.24.noarch/include/linux/ssb/ssb_driver_gige.h
---- /dev/null	2008-04-07 22:07:49.954007376 -0400
-+++ linux-2.6.24.noarch/include/linux/ssb/ssb_driver_gige.h	2008-04-07 23:33:46.000000000 -0400
+--- /dev/null	2008-04-08 00:00:49.269005103 -0400
++++ linux-2.6.24.noarch/include/linux/ssb/ssb_driver_gige.h	2008-04-08 00:15:32.000000000 -0400
 @@ -0,0 +1,174 @@
 +#ifndef LINUX_SSB_DRIVER_GIGE_H_
 +#define LINUX_SSB_DRIVER_GIGE_H_
@@ -6018,8 +6018,8 @@
 +#endif /* CONFIG_SSB_DRIVER_GIGE */
 +#endif /* LINUX_SSB_DRIVER_GIGE_H_ */
 diff -up linux-2.6.24.noarch/include/linux/ssb/ssb_driver_pci.h.orig linux-2.6.24.noarch/include/linux/ssb/ssb_driver_pci.h
---- linux-2.6.24.noarch/include/linux/ssb/ssb_driver_pci.h.orig	2008-04-07 23:22:03.000000000 -0400
-+++ linux-2.6.24.noarch/include/linux/ssb/ssb_driver_pci.h	2008-04-07 23:33:46.000000000 -0400
+--- linux-2.6.24.noarch/include/linux/ssb/ssb_driver_pci.h.orig	2008-04-08 00:15:25.000000000 -0400
++++ linux-2.6.24.noarch/include/linux/ssb/ssb_driver_pci.h	2008-04-08 00:15:32.000000000 -0400
 @@ -1,6 +1,11 @@
  #ifndef LINUX_SSB_PCICORE_H_
  #define LINUX_SSB_PCICORE_H_
@@ -6060,8 +6060,8 @@
  #endif /* CONFIG_SSB_DRIVER_PCICORE */
  #endif /* LINUX_SSB_PCICORE_H_ */
 diff -up linux-2.6.24.noarch/include/linux/ssb/ssb.h.orig linux-2.6.24.noarch/include/linux/ssb/ssb.h
---- linux-2.6.24.noarch/include/linux/ssb/ssb.h.orig	2008-04-07 23:22:03.000000000 -0400
-+++ linux-2.6.24.noarch/include/linux/ssb/ssb.h	2008-04-07 23:33:46.000000000 -0400
+--- linux-2.6.24.noarch/include/linux/ssb/ssb.h.orig	2008-04-08 00:15:25.000000000 -0400
++++ linux-2.6.24.noarch/include/linux/ssb/ssb.h	2008-04-08 00:15:32.000000000 -0400
 @@ -72,8 +72,10 @@ struct ssb_device;
  /* Lowlevel read/write operations on the device MMIO.
   * Internal, don't use that outside of ssb. */
@@ -6121,8 +6121,8 @@
  
  #endif /* LINUX_SSB_H_ */
 diff -up linux-2.6.24.noarch/include/net/wireless.h.orig linux-2.6.24.noarch/include/net/wireless.h
---- linux-2.6.24.noarch/include/net/wireless.h.orig	2008-01-24 17:58:37.000000000 -0500
-+++ linux-2.6.24.noarch/include/net/wireless.h	2008-04-07 23:33:46.000000000 -0400
+--- linux-2.6.24.noarch/include/net/wireless.h.orig	2008-04-08 00:15:25.000000000 -0400
++++ linux-2.6.24.noarch/include/net/wireless.h	2008-04-08 00:15:32.000000000 -0400
 @@ -13,6 +13,162 @@
  #include <net/cfg80211.h>
  
@@ -6329,8 +6329,8 @@
 +}
  #endif /* __NET_WIRELESS_H */
 diff -up linux-2.6.24.noarch/include/net/cfg80211.h.orig linux-2.6.24.noarch/include/net/cfg80211.h
---- linux-2.6.24.noarch/include/net/cfg80211.h.orig	2008-04-07 23:22:04.000000000 -0400
-+++ linux-2.6.24.noarch/include/net/cfg80211.h	2008-04-07 23:33:46.000000000 -0400
+--- linux-2.6.24.noarch/include/net/cfg80211.h.orig	2008-04-08 00:15:25.000000000 -0400
++++ linux-2.6.24.noarch/include/net/cfg80211.h	2008-04-08 00:15:32.000000000 -0400
 @@ -12,6 +12,16 @@
   * Copyright 2006, 2007	Johannes Berg <johannes at sipsolutions.net>
   */
@@ -6552,8 +6552,8 @@
  
  #endif /* __NET_CFG80211_H */
 diff -up linux-2.6.24.noarch/include/net/ieee80211.h.orig linux-2.6.24.noarch/include/net/ieee80211.h
---- linux-2.6.24.noarch/include/net/ieee80211.h.orig	2008-04-07 23:22:04.000000000 -0400
-+++ linux-2.6.24.noarch/include/net/ieee80211.h	2008-04-07 23:33:46.000000000 -0400
+--- linux-2.6.24.noarch/include/net/ieee80211.h.orig	2008-04-08 00:15:25.000000000 -0400
++++ linux-2.6.24.noarch/include/net/ieee80211.h	2008-04-08 00:15:32.000000000 -0400
 @@ -183,7 +183,6 @@ const char *escape_essid(const char *ess
  #define IEEE80211_DEBUG_RX(f, a...)  IEEE80211_DEBUG(IEEE80211_DL_RX, f, ## a)
  #define IEEE80211_DEBUG_QOS(f, a...)  IEEE80211_DEBUG(IEEE80211_DL_QOS, f, ## a)
@@ -6563,8 +6563,8 @@
  
  #ifndef WIRELESS_SPY
 diff -up linux-2.6.24.noarch/include/net/mac80211.h.orig linux-2.6.24.noarch/include/net/mac80211.h
---- linux-2.6.24.noarch/include/net/mac80211.h.orig	2008-04-07 23:22:04.000000000 -0400
-+++ linux-2.6.24.noarch/include/net/mac80211.h	2008-04-07 23:33:46.000000000 -0400
+--- linux-2.6.24.noarch/include/net/mac80211.h.orig	2008-04-08 00:15:25.000000000 -0400
++++ linux-2.6.24.noarch/include/net/mac80211.h	2008-04-08 00:15:32.000000000 -0400
 @@ -38,7 +38,11 @@
   * called in hardware interrupt context. The low-level driver must not call any
   * other functions in hardware interrupt context. If there is a need for such
@@ -7413,8 +7413,8 @@
 +
  #endif /* MAC80211_H */
 diff -up linux-2.6.24.noarch/include/net/ieee80211softmac.h.orig linux-2.6.24.noarch/include/net/ieee80211softmac.h
---- linux-2.6.24.noarch/include/net/ieee80211softmac.h.orig	2008-01-24 17:58:37.000000000 -0500
-+++ linux-2.6.24.noarch/include/net/ieee80211softmac.h	2008-04-07 23:33:46.000000000 -0400
+--- linux-2.6.24.noarch/include/net/ieee80211softmac.h.orig	2008-04-08 00:15:25.000000000 -0400
++++ linux-2.6.24.noarch/include/net/ieee80211softmac.h	2008-04-08 00:15:32.000000000 -0400
 @@ -1,373 +0,0 @@
 -/*
 - * ieee80211softmac.h - public interface to the softmac
@@ -7790,8 +7790,8 @@
 -
 -#endif /* IEEE80211SOFTMAC_H_ */
 diff -up linux-2.6.24.noarch/include/net/ieee80211softmac_wx.h.orig linux-2.6.24.noarch/include/net/ieee80211softmac_wx.h
---- linux-2.6.24.noarch/include/net/ieee80211softmac_wx.h.orig	2008-01-24 17:58:37.000000000 -0500
-+++ linux-2.6.24.noarch/include/net/ieee80211softmac_wx.h	2008-04-07 23:33:46.000000000 -0400
+--- linux-2.6.24.noarch/include/net/ieee80211softmac_wx.h.orig	2008-04-08 00:15:25.000000000 -0400
++++ linux-2.6.24.noarch/include/net/ieee80211softmac_wx.h	2008-04-08 00:15:32.000000000 -0400
 @@ -1,99 +0,0 @@
 -/*
 - * This file contains the prototypes for the wireless extension
@@ -7893,8 +7893,8 @@
 -			     char *extra);
 -#endif /* _IEEE80211SOFTMAC_WX */
 diff -up linux-2.6.24.noarch/MAINTAINERS.orig linux-2.6.24.noarch/MAINTAINERS
---- linux-2.6.24.noarch/MAINTAINERS.orig	2008-04-07 23:20:57.000000000 -0400
-+++ linux-2.6.24.noarch/MAINTAINERS	2008-04-07 23:33:47.000000000 -0400
+--- linux-2.6.24.noarch/MAINTAINERS.orig	2008-04-08 00:15:25.000000000 -0400
++++ linux-2.6.24.noarch/MAINTAINERS	2008-04-08 00:15:32.000000000 -0400
 @@ -840,15 +840,6 @@ L:	linux-wireless at vger.kernel.org
  W:	http://linuxwireless.org/en/users/Drivers/b43
  S:	Maintained
@@ -7925,16 +7925,16 @@
  P:	Ingo Molnar
  M:	mingo at redhat.com
 diff -up linux-2.6.24.noarch/net/ieee80211/Makefile.orig linux-2.6.24.noarch/net/ieee80211/Makefile
---- linux-2.6.24.noarch/net/ieee80211/Makefile.orig	2008-01-24 17:58:37.000000000 -0500
-+++ linux-2.6.24.noarch/net/ieee80211/Makefile	2008-04-07 23:33:47.000000000 -0400
+--- linux-2.6.24.noarch/net/ieee80211/Makefile.orig	2008-04-08 00:15:25.000000000 -0400
++++ linux-2.6.24.noarch/net/ieee80211/Makefile	2008-04-08 00:15:33.000000000 -0400
 @@ -10,4 +10,3 @@ ieee80211-objs := \
  	ieee80211_wx.o \
  	ieee80211_geo.o
  
 -obj-$(CONFIG_IEEE80211_SOFTMAC) += softmac/
 diff -up linux-2.6.24.noarch/net/ieee80211/softmac/Makefile.orig linux-2.6.24.noarch/net/ieee80211/softmac/Makefile
---- linux-2.6.24.noarch/net/ieee80211/softmac/Makefile.orig	2008-01-24 17:58:37.000000000 -0500
-+++ linux-2.6.24.noarch/net/ieee80211/softmac/Makefile	2008-04-07 23:33:47.000000000 -0400
+--- linux-2.6.24.noarch/net/ieee80211/softmac/Makefile.orig	2008-04-08 00:15:25.000000000 -0400
++++ linux-2.6.24.noarch/net/ieee80211/softmac/Makefile	2008-04-08 00:15:33.000000000 -0400
 @@ -1,9 +0,0 @@
 -obj-$(CONFIG_IEEE80211_SOFTMAC) += ieee80211softmac.o
 -ieee80211softmac-objs := \
@@ -7946,8 +7946,8 @@
 -			ieee80211softmac_assoc.o \
 -			ieee80211softmac_event.o
 diff -up linux-2.6.24.noarch/net/ieee80211/softmac/ieee80211softmac_assoc.c.orig linux-2.6.24.noarch/net/ieee80211/softmac/ieee80211softmac_assoc.c
---- linux-2.6.24.noarch/net/ieee80211/softmac/ieee80211softmac_assoc.c.orig	2008-01-24 17:58:37.000000000 -0500
-+++ linux-2.6.24.noarch/net/ieee80211/softmac/ieee80211softmac_assoc.c	2008-04-07 23:33:47.000000000 -0400
+--- linux-2.6.24.noarch/net/ieee80211/softmac/ieee80211softmac_assoc.c.orig	2008-04-08 00:15:25.000000000 -0400
++++ linux-2.6.24.noarch/net/ieee80211/softmac/ieee80211softmac_assoc.c	2008-04-08 00:15:33.000000000 -0400
 @@ -1,489 +0,0 @@
 -/*
 - * This file contains the softmac's association logic.
@@ -8439,8 +8439,8 @@
 -	return 0;
 -}
 diff -up linux-2.6.24.noarch/net/ieee80211/softmac/ieee80211softmac_io.c.orig linux-2.6.24.noarch/net/ieee80211/softmac/ieee80211softmac_io.c
---- linux-2.6.24.noarch/net/ieee80211/softmac/ieee80211softmac_io.c.orig	2008-04-07 23:22:07.000000000 -0400
-+++ linux-2.6.24.noarch/net/ieee80211/softmac/ieee80211softmac_io.c	2008-04-07 23:33:47.000000000 -0400
[...2585 lines suppressed...]
  				   struct ieee80211_conf *conf)
  {
@@ -93009,8 +93011,8 @@
  
  	/* While philips SA2400 drive the PA bias from
 diff -up linux-2.6.24.noarch/drivers/net/wireless/adm8211.c.orig linux-2.6.24.noarch/drivers/net/wireless/adm8211.c
---- linux-2.6.24.noarch/drivers/net/wireless/adm8211.c.orig	2008-04-07 23:21:33.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/net/wireless/adm8211.c	2008-04-07 23:33:47.000000000 -0400
+--- linux-2.6.24.noarch/drivers/net/wireless/adm8211.c.orig	2008-04-08 00:15:26.000000000 -0400
++++ linux-2.6.24.noarch/drivers/net/wireless/adm8211.c	2008-04-08 00:15:33.000000000 -0400
 @@ -48,6 +48,32 @@ static struct pci_device_id adm8211_pci_
  	{ 0 }
  };
@@ -93180,8 +93182,8 @@
  	err = ieee80211_register_hw(dev);
  	if (err) {
 diff -up linux-2.6.24.noarch/drivers/ssb/Makefile.orig linux-2.6.24.noarch/drivers/ssb/Makefile
---- linux-2.6.24.noarch/drivers/ssb/Makefile.orig	2008-04-07 23:21:44.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/Makefile	2008-04-07 23:33:47.000000000 -0400
+--- linux-2.6.24.noarch/drivers/ssb/Makefile.orig	2008-04-08 00:15:26.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/Makefile	2008-04-08 00:15:33.000000000 -0400
 @@ -1,6 +1,7 @@
  # core
  ssb-y					+= main.o scan.o
@@ -93199,8 +93201,8 @@
  # b43 pci-ssb-bridge driver
  # Not strictly a part of SSB, but kept here for convenience
 diff -up linux-2.6.24.noarch/drivers/ssb/pcmcia.c.orig linux-2.6.24.noarch/drivers/ssb/pcmcia.c
---- linux-2.6.24.noarch/drivers/ssb/pcmcia.c.orig	2008-04-07 23:21:44.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/pcmcia.c	2008-04-07 23:33:47.000000000 -0400
+--- linux-2.6.24.noarch/drivers/ssb/pcmcia.c.orig	2008-04-08 00:15:26.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/pcmcia.c	2008-04-08 00:15:33.000000000 -0400
 @@ -3,7 +3,7 @@
   * PCMCIA-Hostbus related functions
   *
@@ -93873,8 +93875,8 @@
 +	return err;
  }
 diff -up linux-2.6.24.noarch/drivers/ssb/main.c.orig linux-2.6.24.noarch/drivers/ssb/main.c
---- linux-2.6.24.noarch/drivers/ssb/main.c.orig	2008-04-07 23:32:00.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/main.c	2008-04-07 23:33:47.000000000 -0400
+--- linux-2.6.24.noarch/drivers/ssb/main.c.orig	2008-04-08 00:15:26.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/main.c	2008-04-08 00:15:33.000000000 -0400
 @@ -14,6 +14,7 @@
  #include <linux/io.h>
  #include <linux/ssb/ssb.h>
@@ -94012,8 +94014,8 @@
  	bus_unregister(&ssb_bustype);
  }
 diff -up linux-2.6.24.noarch/drivers/ssb/driver_mipscore.c.orig linux-2.6.24.noarch/drivers/ssb/driver_mipscore.c
---- linux-2.6.24.noarch/drivers/ssb/driver_mipscore.c.orig	2008-01-24 17:58:37.000000000 -0500
-+++ linux-2.6.24.noarch/drivers/ssb/driver_mipscore.c	2008-04-07 23:33:47.000000000 -0400
+--- linux-2.6.24.noarch/drivers/ssb/driver_mipscore.c.orig	2008-04-08 00:15:26.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/driver_mipscore.c	2008-04-08 00:15:33.000000000 -0400
 @@ -209,6 +209,7 @@ void ssb_mipscore_init(struct ssb_mipsco
  			/* fallthrough */
  		case SSB_DEV_PCI:
@@ -94023,8 +94025,8 @@
  		case SSB_DEV_USB20_HOST:
  			/* These devices get their own IRQ line if available, the rest goes on IRQ0 */
 diff -up linux-2.6.24.noarch/drivers/ssb/ssb_private.h.orig linux-2.6.24.noarch/drivers/ssb/ssb_private.h
---- linux-2.6.24.noarch/drivers/ssb/ssb_private.h.orig	2008-04-07 23:21:44.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/ssb_private.h	2008-04-07 23:33:47.000000000 -0400
+--- linux-2.6.24.noarch/drivers/ssb/ssb_private.h.orig	2008-04-08 00:15:26.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/ssb_private.h	2008-04-08 00:15:33.000000000 -0400
 @@ -81,6 +81,7 @@ extern int ssb_pcmcia_switch_segment(str
  				     u8 seg);
  extern int ssb_pcmcia_get_invariants(struct ssb_bus *bus,
@@ -94071,8 +94073,8 @@
  /* b43_pci_bridge.c */
  #ifdef CONFIG_SSB_B43_PCI_BRIDGE
 diff -up /dev/null linux-2.6.24.noarch/drivers/ssb/driver_gige.c
---- /dev/null	2008-04-07 22:07:49.954007376 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/driver_gige.c	2008-04-07 23:33:47.000000000 -0400
+--- /dev/null	2008-04-08 00:00:49.269005103 -0400
++++ linux-2.6.24.noarch/drivers/ssb/driver_gige.c	2008-04-08 00:15:33.000000000 -0400
 @@ -0,0 +1,294 @@
 +/*
 + * Sonics Silicon Backplane
@@ -94369,8 +94371,8 @@
 +	return ssb_driver_register(&ssb_gige_driver);
 +}
 diff -up linux-2.6.24.noarch/drivers/ssb/pci.c.orig linux-2.6.24.noarch/drivers/ssb/pci.c
---- linux-2.6.24.noarch/drivers/ssb/pci.c.orig	2008-04-07 23:21:44.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/pci.c	2008-04-07 23:33:47.000000000 -0400
+--- linux-2.6.24.noarch/drivers/ssb/pci.c.orig	2008-04-08 00:15:26.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/pci.c	2008-04-08 00:15:33.000000000 -0400
 @@ -227,7 +227,7 @@ static u8 ssb_sprom_crc(const u16 *sprom
  	return crc;
  }
@@ -94587,8 +94589,8 @@
  	if (err)
  		goto out;
 diff -up linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c.orig linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c
---- linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c.orig	2008-04-07 23:21:44.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c	2008-04-07 23:33:47.000000000 -0400
+--- linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c.orig	2008-04-08 00:15:26.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c	2008-04-08 00:15:33.000000000 -0400
 @@ -353,6 +353,16 @@ void ssb_chipco_watchdog_timer_set(struc
  	chipco_write32(cc, SSB_CHIPCO_WATCHDOG, ticks);
  }
@@ -94607,8 +94609,8 @@
  {
  	return chipco_read32(cc, SSB_CHIPCO_GPIOIN) & mask;
 diff -up linux-2.6.24.noarch/drivers/ssb/Kconfig.orig linux-2.6.24.noarch/drivers/ssb/Kconfig
---- linux-2.6.24.noarch/drivers/ssb/Kconfig.orig	2008-04-07 23:21:44.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/Kconfig	2008-04-07 23:33:47.000000000 -0400
+--- linux-2.6.24.noarch/drivers/ssb/Kconfig.orig	2008-04-08 00:15:26.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/Kconfig	2008-04-08 00:15:33.000000000 -0400
 @@ -20,6 +20,10 @@ config SSB
  
  	  If unsure, say N.
@@ -94651,8 +94653,8 @@
 +
  endmenu
 diff -up linux-2.6.24.noarch/drivers/ssb/embedded.c.orig linux-2.6.24.noarch/drivers/ssb/embedded.c
---- linux-2.6.24.noarch/drivers/ssb/embedded.c.orig	2008-04-07 23:21:44.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/embedded.c	2008-04-07 23:33:47.000000000 -0400
+--- linux-2.6.24.noarch/drivers/ssb/embedded.c.orig	2008-04-08 00:15:26.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/embedded.c	2008-04-08 00:15:33.000000000 -0400
 @@ -10,6 +10,9 @@
  
  #include <linux/ssb/ssb.h>
@@ -94755,8 +94757,8 @@
 +	return -ENODEV;
 +}
 diff -up linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c.orig linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c
---- linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c.orig	2008-04-07 23:21:44.000000000 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c	2008-04-07 23:33:47.000000000 -0400
+--- linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c.orig	2008-04-08 00:15:26.000000000 -0400
++++ linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c	2008-04-08 00:15:33.000000000 -0400
 @@ -60,77 +60,6 @@ static DEFINE_SPINLOCK(cfgspace_lock);
  /* Core to access the external PCI config space. Can only have one. */
  static struct ssb_pcicore *extpci_core;
@@ -94932,8 +94934,8 @@
  {
  	u32 val;
 diff -up /dev/null linux-2.6.24.noarch/drivers/ssb/sprom.c
---- /dev/null	2008-04-07 22:07:49.954007376 -0400
-+++ linux-2.6.24.noarch/drivers/ssb/sprom.c	2008-04-07 23:33:47.000000000 -0400
+--- /dev/null	2008-04-08 00:00:49.269005103 -0400
++++ linux-2.6.24.noarch/drivers/ssb/sprom.c	2008-04-08 00:15:33.000000000 -0400
 @@ -0,0 +1,133 @@
 +/*
 + * Sonics Silicon Backplane
@@ -95069,8 +95071,8 @@
 +	return err ? err : count;
 +}
 diff -up linux-2.6.24.noarch/Documentation/laptops/acer-wmi.txt.orig linux-2.6.24.noarch/Documentation/laptops/acer-wmi.txt
---- linux-2.6.24.noarch/Documentation/laptops/acer-wmi.txt.orig	2008-04-07 23:20:56.000000000 -0400
-+++ linux-2.6.24.noarch/Documentation/laptops/acer-wmi.txt	2008-04-07 23:33:47.000000000 -0400
+--- linux-2.6.24.noarch/Documentation/laptops/acer-wmi.txt.orig	2008-04-08 00:15:26.000000000 -0400
++++ linux-2.6.24.noarch/Documentation/laptops/acer-wmi.txt	2008-04-08 00:15:33.000000000 -0400
 @@ -80,7 +80,7 @@ once you enable the radio, will depend o
  e.g. With the BCM4318 on the Acer Aspire 5020 series:
  
@@ -95081,8 +95083,8 @@
  Wireless radio control is unconditionally enabled - all Acer laptops that support
  acer-wmi come with built-in wireless. However, should you feel so inclined to
 diff -up linux-2.6.24.noarch/Documentation/networking/bcm43xx.txt.orig linux-2.6.24.noarch/Documentation/networking/bcm43xx.txt
---- linux-2.6.24.noarch/Documentation/networking/bcm43xx.txt.orig	2008-01-24 17:58:37.000000000 -0500
-+++ linux-2.6.24.noarch/Documentation/networking/bcm43xx.txt	2008-04-07 23:33:47.000000000 -0400
+--- linux-2.6.24.noarch/Documentation/networking/bcm43xx.txt.orig	2008-04-08 00:15:26.000000000 -0400
++++ linux-2.6.24.noarch/Documentation/networking/bcm43xx.txt	2008-04-08 00:15:33.000000000 -0400
 @@ -1,89 +0,0 @@
 -
 -			BCM43xx Linux Driver Project
@@ -95174,8 +95176,8 @@
 -and CONFIG_IEEE80211_SOFTMAC_DEBUG. The log information provided is
 -essential for solving any problems.
 diff -up /dev/null linux-2.6.24.noarch/Documentation/DocBook/mac80211.tmpl
---- /dev/null	2008-04-07 22:07:49.954007376 -0400
-+++ linux-2.6.24.noarch/Documentation/DocBook/mac80211.tmpl	2008-04-07 23:33:47.000000000 -0400
+--- /dev/null	2008-04-08 00:00:49.269005103 -0400
++++ linux-2.6.24.noarch/Documentation/DocBook/mac80211.tmpl	2008-04-08 00:15:33.000000000 -0400
 @@ -0,0 +1,335 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
@@ -95513,8 +95515,8 @@
 +  </part>
 +</book>
 diff -up linux-2.6.24.noarch/Documentation/DocBook/Makefile.orig linux-2.6.24.noarch/Documentation/DocBook/Makefile
---- linux-2.6.24.noarch/Documentation/DocBook/Makefile.orig	2008-04-07 23:32:00.000000000 -0400
-+++ linux-2.6.24.noarch/Documentation/DocBook/Makefile	2008-04-07 23:33:47.000000000 -0400
+--- linux-2.6.24.noarch/Documentation/DocBook/Makefile.orig	2008-04-08 00:15:26.000000000 -0400
++++ linux-2.6.24.noarch/Documentation/DocBook/Makefile	2008-04-08 00:15:33.000000000 -0400
 @@ -11,7 +11,8 @@ DOCBOOKS := wanbook.xml z8530book.xml mc
  	    procfs-guide.xml writing_usb_driver.xml networking.xml \
  	    kernel-api.xml filesystems.xml lsm.xml usb.xml \
@@ -95526,8 +95528,8 @@
  ###
  # The build process is as follows (targets):
 diff -up linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt.orig linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt
---- linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt.orig	2008-04-07 23:20:56.000000000 -0400
-+++ linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt	2008-04-07 23:33:47.000000000 -0400
+--- linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt.orig	2008-04-08 00:15:26.000000000 -0400
++++ linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt	2008-04-08 00:15:33.000000000 -0400
 @@ -230,33 +230,6 @@ Who:	Jean Delvare <khali at linux-fr.org>
  
  ---------------------------




More information about the scm-commits mailing list