rpms/kernel/devel git-wireless-dev.patch, 1.13, 1.14 kernel-2.6.spec, 1.3238, 1.3239

John W. Linville (linville) fedora-extras-commits at redhat.com
Mon Jun 25 14:31:48 UTC 2007


Author: linville

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

Modified Files:
	git-wireless-dev.patch kernel-2.6.spec 
Log Message:
re-enable wireless-dev patch

git-wireless-dev.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.13 -r 1.14 git-wireless-dev.patch
Index: git-wireless-dev.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/git-wireless-dev.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- git-wireless-dev.patch	13 Jun 2007 20:37:07 -0000	1.13
+++ git-wireless-dev.patch	25 Jun 2007 14:31:12 -0000	1.14
@@ -1,5 +1,5 @@
---- linux-2.6.21.noarch/CREDITS.orig	2007-06-13 15:29:50.000000000 -0400
-+++ linux-2.6.21.noarch/CREDITS	2007-06-13 15:32:28.000000000 -0400
+--- linux-2.6.21.noarch/CREDITS.orig	2007-06-25 09:16:57.000000000 -0400
++++ linux-2.6.21.noarch/CREDITS	2007-06-25 09:55:35.000000000 -0400
 @@ -665,6 +665,11 @@ D: Minor updates to SCSI types, added /p
  S: (ask for current address)
  S: USA
@@ -37,7 +37,7 @@
  N: John G Dorsey
  E: john+ at cs.cmu.edu
  D: ARM Linux ports to Assabet/Neponset, Spot
-@@ -3524,6 +3540,12 @@ S: Maastrichterweg 63
+@@ -3516,6 +3532,12 @@ S: Maastrichterweg 63
  S: 5554 GG Valkenswaard
  S: The Netherlands
  
@@ -50,7 +50,7 @@
  N: Peter Shaobo Wang
  E: pwang at mmdcorp.com
  W: http://www.mmdcorp.com/pw/linux
-@@ -3658,6 +3680,15 @@ S: Alte Regensburger Str. 11a
+@@ -3650,6 +3672,15 @@ S: Alte Regensburger Str. 11a
  S: 93149 Nittenau
  S: Germany
  
@@ -66,8 +66,8 @@
  N: Lars Wirzenius
  E: liw at iki.fi
  D: Linux System Administrator's Guide, author, former maintainer
---- linux-2.6.21.noarch/include/linux/nl80211.h.orig	2007-06-13 15:30:05.000000000 -0400
-+++ linux-2.6.21.noarch/include/linux/nl80211.h	2007-06-13 15:32:28.000000000 -0400
+--- linux-2.6.21.noarch/include/linux/nl80211.h.orig	2007-06-25 09:16:53.000000000 -0400
++++ linux-2.6.21.noarch/include/linux/nl80211.h	2007-06-25 09:55:35.000000000 -0400
 @@ -7,6 +7,217 @@
   */
  
@@ -343,8 +343,8 @@
 +#define NL80211_KEYTYPE_MAX (__NL80211_KEYTYPE_AFTER_LAST - 1)
 +
  #endif /* __LINUX_NL80211_H */
---- linux-2.6.21.noarch/include/linux/ieee80211.h.orig	2007-06-13 15:30:04.000000000 -0400
-+++ linux-2.6.21.noarch/include/linux/ieee80211.h	2007-06-13 15:32:28.000000000 -0400
+--- linux-2.6.21.noarch/include/linux/ieee80211.h.orig	2007-06-25 09:16:53.000000000 -0400
++++ linux-2.6.21.noarch/include/linux/ieee80211.h	2007-06-25 09:55:35.000000000 -0400
 @@ -106,6 +106,75 @@ struct ieee80211_hdr {
  } __attribute__ ((packed));
  
@@ -643,8 +643,8 @@
 +};
 +
  #endif /* IEEE80211_H */
---- /dev/null	2007-06-13 08:37:39.438809838 -0400
-+++ linux-2.6.21.noarch/include/linux/eeprom_93cx6.h	2007-06-13 15:32:28.000000000 -0400
+--- /dev/null	2007-06-25 08:13:03.438982207 -0400
++++ linux-2.6.21.noarch/include/linux/eeprom_93cx6.h	2007-06-25 09:55:35.000000000 -0400
 @@ -0,0 +1,77 @@
 +/*
 +	Copyright (C) 2004 - 2006 rt2x00 SourceForge Project
@@ -723,8 +723,8 @@
 +	const u8 word, u16 data);
 +extern void eeprom_93cx6_multiwrite(struct eeprom_93cx6 *eeprom,
 +	const u8 word, __le16 *data, const u16 words);
---- /dev/null	2007-06-13 08:37:39.438809838 -0400
-+++ linux-2.6.21.noarch/include/linux/ssb/ssb_driver_chipcommon.h	2007-06-13 15:32:28.000000000 -0400
+--- /dev/null	2007-06-25 08:13:03.438982207 -0400
++++ linux-2.6.21.noarch/include/linux/ssb/ssb_driver_chipcommon.h	2007-06-25 09:55:35.000000000 -0400
 @@ -0,0 +1,387 @@
 +#ifndef LINUX_SSB_CHIPCO_H_
 +#define LINUX_SSB_CHIPCO_H_
@@ -1113,8 +1113,8 @@
 +
 +#endif /* __KERNEL__ */
 +#endif /* LINUX_SSB_CHIPCO_H_ */
---- /dev/null	2007-06-13 08:37:39.438809838 -0400
-+++ linux-2.6.21.noarch/include/linux/ssb/ssb_driver_extif.h	2007-06-13 15:32:28.000000000 -0400
+--- /dev/null	2007-06-25 08:13:03.438982207 -0400
++++ linux-2.6.21.noarch/include/linux/ssb/ssb_driver_extif.h	2007-06-25 09:55:35.000000000 -0400
 @@ -0,0 +1,163 @@
 +/*
 + * Hardware-specific External Interface I/O core definitions
@@ -1279,8 +1279,8 @@
 +
 +#endif /* __KERNEL__ */
 +#endif /* LINUX_SSB_EXTIFCORE_H_ */
---- /dev/null	2007-06-13 08:37:39.438809838 -0400
-+++ linux-2.6.21.noarch/include/linux/ssb/ssb_driver_mips.h	2007-06-13 15:32:28.000000000 -0400
+--- /dev/null	2007-06-25 08:13:03.438982207 -0400
++++ linux-2.6.21.noarch/include/linux/ssb/ssb_driver_mips.h	2007-06-25 09:55:35.000000000 -0400
 @@ -0,0 +1,47 @@
 +#ifndef LINUX_SSB_MIPSCORE_H_
 +#define LINUX_SSB_MIPSCORE_H_
@@ -1329,8 +1329,8 @@
 +
 +#endif /* __KERNEL__ */
 +#endif /* LINUX_SSB_MIPSCORE_H_ */
---- /dev/null	2007-06-13 08:37:39.438809838 -0400
-+++ linux-2.6.21.noarch/include/linux/ssb/ssb_regs.h	2007-06-13 15:32:28.000000000 -0400
+--- /dev/null	2007-06-25 08:13:03.438982207 -0400
++++ linux-2.6.21.noarch/include/linux/ssb/ssb_regs.h	2007-06-25 09:55:35.000000000 -0400
 @@ -0,0 +1,294 @@
 +#ifndef LINUX_SSB_REGS_H_
 +#define LINUX_SSB_REGS_H_
@@ -1626,8 +1626,8 @@
 +
 +#endif /* __KERNEL__ */
 +#endif /* LINUX_SSB_REGS_H_ */
---- /dev/null	2007-06-13 08:37:39.438809838 -0400
-+++ linux-2.6.21.noarch/include/linux/ssb/ssb_driver_pci.h	2007-06-13 15:32:28.000000000 -0400
+--- /dev/null	2007-06-25 08:13:03.438982207 -0400
++++ linux-2.6.21.noarch/include/linux/ssb/ssb_driver_pci.h	2007-06-25 09:55:35.000000000 -0400
 @@ -0,0 +1,108 @@
 +#ifndef LINUX_SSB_PCICORE_H_
 +#define LINUX_SSB_PCICORE_H_
@@ -1737,8 +1737,8 @@
 +#endif /* CONFIG_SSB_DRIVER_PCICORE */
 +#endif /* __KERNEL__ */
 +#endif /* LINUX_SSB_PCICORE_H_ */
---- /dev/null	2007-06-13 08:37:39.438809838 -0400
-+++ linux-2.6.21.noarch/include/linux/ssb/ssb.h	2007-06-13 15:32:28.000000000 -0400
+--- /dev/null	2007-06-25 08:13:03.438982207 -0400
++++ linux-2.6.21.noarch/include/linux/ssb/ssb.h	2007-06-25 09:55:35.000000000 -0400
 @@ -0,0 +1,403 @@
 +#ifndef LINUX_SSB_H_
 +#define LINUX_SSB_H_
@@ -2143,8 +2143,8 @@
 +
 +#endif /* __KERNEL__ */
 +#endif /* LINUX_SSB_H_ */
---- linux-2.6.21.noarch/include/net/cfg80211.h.orig	2007-06-13 15:30:05.000000000 -0400
-+++ linux-2.6.21.noarch/include/net/cfg80211.h	2007-06-13 15:32:28.000000000 -0400
+--- linux-2.6.21.noarch/include/net/cfg80211.h.orig	2007-06-25 09:16:53.000000000 -0400
++++ linux-2.6.21.noarch/include/net/cfg80211.h	2007-06-25 09:55:35.000000000 -0400
 @@ -3,6 +3,7 @@
  
  #include <linux/netlink.h>
@@ -2287,8 +2287,8 @@
 +			    u32 seq, int flags, u8 cmd);
 +
  #endif /* __NET_CFG80211_H */
---- linux-2.6.21.noarch/include/net/mac80211.h.orig	2007-06-13 15:30:05.000000000 -0400
-+++ linux-2.6.21.noarch/include/net/mac80211.h	2007-06-13 15:32:28.000000000 -0400
+--- linux-2.6.21.noarch/include/net/mac80211.h.orig	2007-06-25 09:16:53.000000000 -0400
++++ linux-2.6.21.noarch/include/net/mac80211.h	2007-06-25 09:55:35.000000000 -0400
 @@ -300,7 +300,6 @@ struct ieee80211_conf {
  	/* Following five fields are used for IEEE 802.11H */
  	unsigned int radar_detect;
@@ -2355,8 +2355,8 @@
  	/* Setup beacon data for IBSS beacons. Unlike access point (Master),
  	 * IBSS uses a fixed beacon frame which is configured using this
  	 * function. This handler is required only for IBSS mode. */
---- linux-2.6.21.noarch/include/net/iw_handler.h.orig	2007-06-13 15:30:05.000000000 -0400
-+++ linux-2.6.21.noarch/include/net/iw_handler.h	2007-06-13 15:32:28.000000000 -0400
+--- linux-2.6.21.noarch/include/net/iw_handler.h.orig	2007-06-25 09:16:53.000000000 -0400
++++ linux-2.6.21.noarch/include/net/iw_handler.h	2007-06-25 09:55:35.000000000 -0400
 @@ -431,7 +431,13 @@ struct iw_public_data {
   * Those may be called only within the kernel.
   */
@@ -2372,8 +2372,8 @@
  
  /* Send a single event to user space */
  extern void wireless_send_event(struct net_device *	dev,
---- linux-2.6.21.noarch/MAINTAINERS.orig	2007-06-13 15:30:05.000000000 -0400
-+++ linux-2.6.21.noarch/MAINTAINERS	2007-06-13 15:32:28.000000000 -0400
+--- linux-2.6.21.noarch/MAINTAINERS.orig	2007-06-25 09:16:57.000000000 -0400
++++ linux-2.6.21.noarch/MAINTAINERS	2007-06-25 09:55:35.000000000 -0400
 @@ -299,6 +299,14 @@ M:	corentin.labbe at geomatys.fr
  L:	lm-sensors at lm-sensors.org
  S:	Maintained
@@ -2389,7 +2389,7 @@
  ADT746X FAN DRIVER
  P:	Colin Leroy
  M:	colin at colino.net
-@@ -767,6 +775,15 @@ L:	linux-hams at vger.kernel.org
+@@ -777,6 +785,15 @@ L:	linux-hams at vger.kernel.org
  W:	http://www.baycom.org/~tom/ham/ham.html
  S:	Maintained
  
@@ -2405,7 +2405,7 @@
  BCM43XX WIRELESS DRIVER (SOFTMAC BASED VERSION)
  P:	Larry Finger
  M:	Larry.Finger at lwfinger.net
-@@ -914,6 +931,12 @@ M:	zambrano at broadcom.com
+@@ -924,6 +941,12 @@ M:	zambrano at broadcom.com
  L:	netdev at vger.kernel.org
  S:	Supported
  
@@ -2418,7 +2418,7 @@
  BROADCOM BNX2 GIGABIT ETHERNET DRIVER
  P:	Michael Chan
  M:	mchan at broadcom.com
-@@ -1967,6 +1990,16 @@ L:	http://lists.sourceforge.net/mailman/
[...1734 lines suppressed...]
+--- /dev/null	2007-06-25 08:13:03.438982207 -0400
++++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500pci.c	2007-06-25 09:55:35.000000000 -0400
 @@ -0,0 +1,2029 @@
 +/*
 +	Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -83690,8 +83652,8 @@
 +
 +module_init(rt2500pci_init);
 +module_exit(rt2500pci_exit);
---- /dev/null	2007-06-13 08:37:39.438809838 -0400
-+++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/rt2x00/rt61pci.c	2007-06-13 15:32:28.000000000 -0400
+--- /dev/null	2007-06-25 08:13:03.438982207 -0400
++++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/rt2x00/rt61pci.c	2007-06-25 09:55:35.000000000 -0400
 @@ -0,0 +1,2443 @@
 +/*
 +	Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -86136,8 +86098,8 @@
 +
 +module_init(rt61pci_init);
 +module_exit(rt61pci_exit);
---- /dev/null	2007-06-13 08:37:39.438809838 -0400
-+++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00pci.c	2007-06-13 15:32:28.000000000 -0400
+--- /dev/null	2007-06-25 08:13:03.438982207 -0400
++++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00pci.c	2007-06-25 09:55:35.000000000 -0400
 @@ -0,0 +1,598 @@
 +/*
 +	Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -86737,8 +86699,8 @@
 +module_param_named(debug, rt2x00_debug_level, bool, S_IWUSR | S_IRUGO);
 +MODULE_PARM_DESC(debug, "Set this parameter to 1 to enable debug output.");
 +#endif /* CONFIG_RT2X00_DEBUG */
---- /dev/null	2007-06-13 08:37:39.438809838 -0400
-+++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00pci.h	2007-06-13 15:32:28.000000000 -0400
+--- /dev/null	2007-06-25 08:13:03.438982207 -0400
++++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00pci.h	2007-06-25 09:55:35.000000000 -0400
 @@ -0,0 +1,83 @@
 +/*
 +	Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -86823,8 +86785,8 @@
 +#endif /* CONFIG_PM */
 +
 +#endif /* RT2X00PCI_H */
---- /dev/null	2007-06-13 08:37:39.438809838 -0400
-+++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/rt2x00/rt73usb.c	2007-06-13 15:32:28.000000000 -0400
+--- /dev/null	2007-06-25 08:13:03.438982207 -0400
++++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/rt2x00/rt73usb.c	2007-06-25 09:55:35.000000000 -0400
 @@ -0,0 +1,2049 @@
 +/*
 +	Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -88875,22 +88837,22 @@
 +
 +module_init(rt73usb_init);
 +module_exit(rt73usb_exit);
---- /dev/null	2007-06-13 08:37:39.438809838 -0400
-+++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/README	2007-06-13 15:32:28.000000000 -0400
+--- /dev/null	2007-06-25 08:13:03.438982207 -0400
++++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/README	2007-06-25 09:55:35.000000000 -0400
 @@ -0,0 +1,2 @@
 +This directory contains IEEE 802.11 wireless LAN drivers that are using
 +Devicescape IEEE 802.11 stack (net/mac80211).
---- linux-2.6.21.noarch/drivers/net/wireless/Kconfig.orig	2007-06-13 15:29:59.000000000 -0400
-+++ linux-2.6.21.noarch/drivers/net/wireless/Kconfig	2007-06-13 15:32:28.000000000 -0400
-@@ -543,4 +543,6 @@ source "drivers/net/wireless/hostap/Kcon
+--- linux-2.6.21.noarch/drivers/net/wireless/Kconfig.orig	2007-06-25 09:16:46.000000000 -0400
++++ linux-2.6.21.noarch/drivers/net/wireless/Kconfig	2007-06-25 09:55:35.000000000 -0400
+@@ -550,4 +550,6 @@ source "drivers/net/wireless/hostap/Kcon
  source "drivers/net/wireless/bcm43xx/Kconfig"
  source "drivers/net/wireless/zd1211rw/Kconfig"
  
 +source "drivers/net/wireless/mac80211/Kconfig"
 +
  endmenu
---- linux-2.6.21.noarch/drivers/net/wireless/bcm43xx/Kconfig.orig	2007-06-13 15:29:59.000000000 -0400
-+++ linux-2.6.21.noarch/drivers/net/wireless/bcm43xx/Kconfig	2007-06-13 15:32:28.000000000 -0400
+--- linux-2.6.21.noarch/drivers/net/wireless/bcm43xx/Kconfig.orig	2007-06-25 09:16:46.000000000 -0400
++++ linux-2.6.21.noarch/drivers/net/wireless/bcm43xx/Kconfig	2007-06-25 09:55:35.000000000 -0400
 @@ -1,6 +1,7 @@
  config BCM43XX
  	tristate "Broadcom BCM43xx wireless support"
@@ -88899,8 +88861,8 @@
  	select WIRELESS_EXT
  	select FW_LOADER
  	select HW_RANDOM
---- /dev/null	2007-06-13 08:37:39.438809838 -0400
-+++ linux-2.6.21.noarch/drivers/ssb/Makefile	2007-06-13 15:32:28.000000000 -0400
+--- /dev/null	2007-06-25 08:13:03.438982207 -0400
++++ linux-2.6.21.noarch/drivers/ssb/Makefile	2007-06-25 09:55:35.000000000 -0400
 @@ -0,0 +1,11 @@
 +ssb-builtin-drivers-y					+= driver_chipcommon.o
 +ssb-builtin-drivers-$(CONFIG_SSB_DRIVER_MIPS)		+= driver_mipscore.o
@@ -88913,8 +88875,8 @@
 +
 +ssb-objs	:= main.o scan.o \
 +		   $(ssb-hostsupport-y) $(ssb-builtin-drivers-y)
---- /dev/null	2007-06-13 08:37:39.438809838 -0400
-+++ linux-2.6.21.noarch/drivers/ssb/pcmcia.c	2007-06-13 15:32:28.000000000 -0400
+--- /dev/null	2007-06-25 08:13:03.438982207 -0400
++++ linux-2.6.21.noarch/drivers/ssb/pcmcia.c	2007-06-25 09:55:35.000000000 -0400
 @@ -0,0 +1,256 @@
 +/*
 + * Sonics Silicon Backplane
@@ -89172,8 +89134,8 @@
 +error:
 +	return -ENODEV;
 +}
---- /dev/null	2007-06-13 08:37:39.438809838 -0400
-+++ linux-2.6.21.noarch/drivers/ssb/main.c	2007-06-13 15:32:28.000000000 -0400
+--- /dev/null	2007-06-25 08:13:03.438982207 -0400
++++ linux-2.6.21.noarch/drivers/ssb/main.c	2007-06-25 09:55:35.000000000 -0400
 @@ -0,0 +1,1054 @@
 +/*
 + * Sonics Silicon Backplane
@@ -90229,8 +90191,8 @@
 +	bus_unregister(&ssb_bustype);
 +}
 +module_exit(ssb_modexit)
---- /dev/null	2007-06-13 08:37:39.438809838 -0400
-+++ linux-2.6.21.noarch/drivers/ssb/pcihost_wrapper.c	2007-06-13 15:32:28.000000000 -0400
+--- /dev/null	2007-06-25 08:13:03.438982207 -0400
++++ linux-2.6.21.noarch/drivers/ssb/pcihost_wrapper.c	2007-06-25 09:55:35.000000000 -0400
 @@ -0,0 +1,104 @@
 +/*
 + * Sonics Silicon Backplane
@@ -90336,8 +90298,8 @@
 +	return pci_register_driver(driver);
 +}
 +EXPORT_SYMBOL(ssb_pcihost_register);
---- /dev/null	2007-06-13 08:37:39.438809838 -0400
-+++ linux-2.6.21.noarch/drivers/ssb/driver_mipscore.c	2007-06-13 15:32:28.000000000 -0400
+--- /dev/null	2007-06-25 08:13:03.438982207 -0400
++++ linux-2.6.21.noarch/drivers/ssb/driver_mipscore.c	2007-06-25 09:55:35.000000000 -0400
 @@ -0,0 +1,258 @@
 +/*
 + * Sonics Silicon Backplane
@@ -90597,8 +90559,8 @@
 +	ssb_mips_serial_init(mcore);
 +	ssb_mips_flash_detect(mcore);
 +}
---- /dev/null	2007-06-13 08:37:39.438809838 -0400
-+++ linux-2.6.21.noarch/drivers/ssb/ssb_private.h	2007-06-13 15:32:28.000000000 -0400
+--- /dev/null	2007-06-25 08:13:03.438982207 -0400
++++ linux-2.6.21.noarch/drivers/ssb/ssb_private.h	2007-06-25 09:55:35.000000000 -0400
 @@ -0,0 +1,151 @@
 +#ifndef LINUX_SSB_PRIVATE_H_
 +#define LINUX_SSB_PRIVATE_H_
@@ -90751,8 +90713,8 @@
 +
 +
 +#endif /* LINUX_SSB_PRIVATE_H_ */
---- /dev/null	2007-06-13 08:37:39.438809838 -0400
-+++ linux-2.6.21.noarch/drivers/ssb/pci.c	2007-06-13 15:32:28.000000000 -0400
+--- /dev/null	2007-06-25 08:13:03.438982207 -0400
++++ linux-2.6.21.noarch/drivers/ssb/pci.c	2007-06-25 09:55:35.000000000 -0400
 @@ -0,0 +1,672 @@
 +/*
 + * Sonics Silicon Backplane PCI-Hostbus related functions.
@@ -91426,8 +91388,8 @@
 +	device_remove_file(&pdev->dev, &dev_attr_ssb_sprom);
 +	return err;
 +}
---- /dev/null	2007-06-13 08:37:39.438809838 -0400
-+++ linux-2.6.21.noarch/drivers/ssb/driver_chipcommon.c	2007-06-13 15:32:28.000000000 -0400
+--- /dev/null	2007-06-25 08:13:03.438982207 -0400
++++ linux-2.6.21.noarch/drivers/ssb/driver_chipcommon.c	2007-06-25 09:55:35.000000000 -0400
 @@ -0,0 +1,402 @@
 +/*
 + * Sonics Silicon Backplane
@@ -91831,8 +91793,8 @@
 +	return nr_ports;
 +}
 +#endif /* CONFIG_SSB_SERIAL */
---- /dev/null	2007-06-13 08:37:39.438809838 -0400
-+++ linux-2.6.21.noarch/drivers/ssb/Kconfig	2007-06-13 15:32:28.000000000 -0400
+--- /dev/null	2007-06-25 08:13:03.438982207 -0400
++++ linux-2.6.21.noarch/drivers/ssb/Kconfig	2007-06-25 09:55:35.000000000 -0400
 @@ -0,0 +1,93 @@
 +menu "Sonics Silicon Backplane"
 +
@@ -91927,8 +91889,8 @@
 +	  If unsure, say N
 +
 +endmenu
---- /dev/null	2007-06-13 08:37:39.438809838 -0400
-+++ linux-2.6.21.noarch/drivers/ssb/scan.c	2007-06-13 15:32:28.000000000 -0400
+--- /dev/null	2007-06-25 08:13:03.438982207 -0400
++++ linux-2.6.21.noarch/drivers/ssb/scan.c	2007-06-25 09:55:35.000000000 -0400
 @@ -0,0 +1,407 @@
 +/*
 + * Sonics Silicon Backplane
@@ -92337,8 +92299,8 @@
 +	ssb_iounmap(bus);
 +	goto out;
 +}
---- /dev/null	2007-06-13 08:37:39.438809838 -0400
-+++ linux-2.6.21.noarch/drivers/ssb/driver_pcicore.c	2007-06-13 15:32:28.000000000 -0400
+--- /dev/null	2007-06-25 08:13:03.438982207 -0400
++++ linux-2.6.21.noarch/drivers/ssb/driver_pcicore.c	2007-06-25 09:55:35.000000000 -0400
 @@ -0,0 +1,556 @@
 +/*
 + * Sonics Silicon Backplane


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3238
retrieving revision 1.3239
diff -u -r1.3238 -r1.3239
--- kernel-2.6.spec	25 Jun 2007 08:34:13 -0000	1.3238
+++ kernel-2.6.spec	25 Jun 2007 14:31:13 -0000	1.3239
@@ -1114,7 +1114,7 @@
 ApplyPatch linux-2.6-ata-quirk.patch
 
 # Add the new wireless stack and drivers from wireless-dev
-#ApplyPatch git-wireless-dev.patch
+ApplyPatch git-wireless-dev.patch
 # avoid bcm3xx vs bcm43xx-mac80211 PCI ID conflicts
 ApplyPatch linux-2.6-bcm43xx-pci-neuter.patch
 
@@ -2090,6 +2090,9 @@
 %endif
 
 %changelog
+* Mon Jun 25 2007 John W. Linville <linville at redhat.com>
+- Re-enable wireless-dev patch (updated for current kernel)
+
 * Mon Jun 25 2007 Roland McGrath <roland at redhat.com>
 - Let spec-file ApplyPatch function pass extra args to patch.
 - Re-enable utrace patch with -F2, needed after nearby CFS change.




More information about the fedora-extras-commits mailing list