2009/stable/kernel/pae/kernel-pae - enable prism2_usb driver from staging (#11641)

[Ozan Çağlayan]

Author: ozan.caglayan
Date: Sat Dec  5 14:56:18 2009
New Revision: 82204

Modified:
   2009/stable/kernel/pae/kernel-pae/   (props changed)
   2009/stable/kernel/pae/kernel-pae/comar/   (props changed)
   2009/stable/kernel/pae/kernel-pae/files/   (props changed)
   2009/stable/kernel/pae/kernel-pae/files/pardus/kernel-config.patch
   2009/stable/kernel/pae/kernel-pae/pspec.xml
Log:
enable prism2_usb driver from staging (#11641)

---
 files/pardus/kernel-config.patch |    6 +++---
 pspec.xml                        |    1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

Modified: 2009/stable/kernel/pae/kernel-pae/files/pardus/kernel-config.patch
=================================================================
--- 2009/stable/kernel/pae/kernel-pae/files/pardus/kernel-config.patch	(original)
+++ 2009/stable/kernel/pae/kernel-pae/files/pardus/kernel-config.patch	Sat Dec  5 14:56:18 2009
@@ -1,10 +1,10 @@
 --- /dev/null	2009-12-04 19:56:23.244380383 +0200
-+++ .config	2009-12-04 15:40:07.762852557 +0200
++++ .config	2009-12-05 15:00:31.232504632 +0200
 @@ -0,0 +1,4374 @@
 +#
 +# Automatically generated make config: don't edit
 +# Linux kernel version: 2.6.30.9-128-pae
-+# Fri Dec  4 15:40:07 2009
++# Sat Dec  5 15:00:31 2009
 +#
 +# CONFIG_64BIT is not set
 +CONFIG_X86_32=y
@@ -3701,7 +3701,7 @@
 +# CONFIG_MEDUMMY is not set
 +# CONFIG_USB_IP_COMMON is not set
 +CONFIG_W35UND=m
-+# CONFIG_PRISM2_USB is not set
++CONFIG_PRISM2_USB=m
 +# CONFIG_ECHO is not set
 +CONFIG_USB_ATMEL=m
 +# CONFIG_POCH is not set

Modified: 2009/stable/kernel/pae/kernel-pae/pspec.xml
=================================================================
--- 2009/stable/kernel/pae/kernel-pae/pspec.xml	(original)
+++ 2009/stable/kernel/pae/kernel-pae/pspec.xml	Sat Dec  5 14:56:18 2009
@@ -510,6 +510,7 @@
                 - security: ipv4: additional update of dev_net(dev) to struct *net in ip_fragment.c, NULL ptr OOPS (#11657),
                 - security: mac80211: Fix two remote exploits (CVE-2009-4026, CVE-2009-4027) (#11658),
                 - security: hfs: Fix a potential buffer overflow (CVE-2009-4020) (#11659),
+                - enable prism2_usb driver from staging (#11641),
                 - ext4: Avoid corrupting the uninitialized bit in the extent during truncate,
                 - net: Fix thinko in backport of skb destructor fix,
                 - atkbd: Add forced release quirk for Samsung R510/P510 (#11565),