rpms/kernel/F-8 linux-2.6-upstream-reverts.patch,1.5,1.6

[Chuck Ebbert (cebbert)]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11210

Modified Files:
	linux-2.6-upstream-reverts.patch 
Log Message:
reverse the new patch in upstream-reverts


linux-2.6-upstream-reverts.patch:

Index: linux-2.6-upstream-reverts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-upstream-reverts.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-upstream-reverts.patch	26 Feb 2008 18:36:09 -0000	1.5
+++ linux-2.6-upstream-reverts.patch	26 Feb 2008 18:42:15 -0000	1.6
@@ -714,18 +714,30 @@
  	/* First register RFkill.
  	 * LEDs that are registered later depend on it. */
  	b43_rfkill_init(dev);
+From ad89bc65f887c6fe6034a080f26755b2f4702aa9 Mon Sep 17 00:00:00 2001
+From: Stephen Hemminger <stephen.hemminger at vyatta.com>
+Date: Fri, 15 Feb 2008 01:31:32 -0800
+Subject: NET: Add if_addrlabel.h to sanitized headers.
 
-if_addrlabel.h doesn't exist in 2.6.24...
+Upstream commit: dded91611a728d65721cdab3dd41d801a356fa15
 
-Index: linux-2.6.24.noarch/include/linux/Kbuild
-===================================================================
---- linux-2.6.24.noarch.orig/include/linux/Kbuild
-+++ linux-2.6.24.noarch/include/linux/Kbuild
-@@ -217,7 +217,6 @@ unifdef-y += i2o-dev.h
+if_addrlabel.h is needed for iproute2 usage.
+
+Signed-off-by: Stephen Hemminger <stephen.hemminger at vyatta.com>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+---
+ include/linux/Kbuild |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/include/linux/Kbuild
++++ b/include/linux/Kbuild
+@@ -217,6 +217,7 @@ unifdef-y += i2o-dev.h
  unifdef-y += icmp.h
  unifdef-y += icmpv6.h
  unifdef-y += if_addr.h
--unifdef-y += if_addrlabel.h
++unifdef-y += if_addrlabel.h
  unifdef-y += if_arp.h
  unifdef-y += if_bridge.h
  unifdef-y += if_ec.h