rpms/kernel/devel config-generic, 1.237, 1.238 kernel.spec, 1.1288, 1.1289 linux-2.6-at76.patch, 1.13, NONE

[John W. Linville]

Author: linville

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1582

Modified Files:
	config-generic kernel.spec 
Removed Files:
	linux-2.6-at76.patch 
Log Message:
Drop linux-2.6-at76.patch in favor of version from drivers/staging (#477927)


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -r1.237 -r1.238
--- config-generic	10 Feb 2009 18:15:30 -0000	1.237
+++ config-generic	11 Feb 2009 20:16:01 -0000	1.238
@@ -1439,7 +1439,6 @@
 CONFIG_RTL8180=m
 CONFIG_RTL8187=m
 CONFIG_TMD_HERMES=m
-CONFIG_USB_ATMEL=m
 CONFIG_USB_ZD1201=m
 CONFIG_USB_NET_RNDIS_WLAN=m
 CONFIG_ZD1211RW=m
@@ -3864,7 +3863,43 @@
 CONFIG_UWB_I1480U=m
 CONFIG_UWB_I1480U_WLP=m
 
-# CONFIG_STAGING is not set
+CONFIG_STAGING=y
+# CONFIG_STAGING_EXCLUDE_BUILD is not set
+# CONFIG_ET131X is not set
+# CONFIG_SLICOSS is not set
+# CONFIG_SXG is not set
+# CONFIG_ME4000 is not set
+# CONFIG_MEILHAUS is not set
+# CONFIG_VIDEO_GO7007 is not set
+# CONFIG_USB_IP_COMMON is not set
+# CONFIG_W35UND is not set
+# CONFIG_PRISM2_USB is not set
+# CONFIG_ECHO is not set
+CONFIG_USB_ATMEL=m
+# CONFIG_POCH is not set
+# CONFIG_AGNX is not set
+# CONFIG_OTUS is not set
+# CONFIG_RT2860 is not set
+# CONFIG_RT2870 is not set
+# CONFIG_BENET is not set
+# CONFIG_COMEDI is not set
+# CONFIG_ASUS_OLED is not set
+# CONFIG_PANEL is not set
+# CONFIG_ALTERA_PCIE_CHDMA is not set
+# CONFIG_RTL8187SE is not set
+# CONFIG_INPUT_MIMIO is not set
+# CONFIG_TRANZPORT is not set
+# CONFIG_EPL is not set
+
+#
+# Android
+#
+# CONFIG_ANDROID is not set
+# CONFIG_ANDROID_BINDER_IPC is not set
+# CONFIG_ANDROID_LOGGER is not set
+# CONFIG_ANDROID_RAM_CONSOLE is not set
+# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set
+# CONFIG_ANDROID_TIMED_GPIO is not set
 
 # CONFIG_DEBUG_VIRTUAL is not set
 # CONFIG_RCU_CPU_STALL_DETECTOR is not set


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1288
retrieving revision 1.1289
diff -u -r1.1288 -r1.1289
--- kernel.spec	11 Feb 2009 15:28:08 -0000	1.1288
+++ kernel.spec	11 Feb 2009 20:16:01 -0000	1.1289
@@ -625,8 +625,6 @@
 
 Patch680: linux-2.6-rt2x00-asus-leds.patch
 
-Patch690: linux-2.6-at76.patch
-
 Patch1515: linux-2.6.29-lirc.patch
 Patch1520: linux-2.6-hdpvr.patch
 
@@ -1125,9 +1123,6 @@
 # rt2x00: back-port activity LED init patches
 ApplyPatch linux-2.6-rt2x00-asus-leds.patch
 
-# Add misc wireless bits from upstream wireless tree
-ApplyPatch linux-2.6-at76.patch
-
 # http://www.lirc.org/
 ApplyPatch linux-2.6.29-lirc.patch
 # http://hg.jannau.net/hdpvr/
@@ -1749,6 +1744,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Wed Feb 11 2009 John W. Linville <linville at redhat.com>
+- Drop linux-2.6-at76.patch in favor of version from drivers/staging (#477927)
+
 * Wed Feb 11 2009 Kristian Høgsberg <krh at redhat.com>
 - Rebase drm-intel-next patch.
 


--- linux-2.6-at76.patch DELETED ---