summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2010-09-28 12:41:18 -0400
committerDave Jones <davej@redhat.com>2010-09-28 12:41:18 -0400
commita98e4a7f91a195d1bf2931df1c1d0b7f624b3836 (patch)
treefdff1ea758d413f8b939c09ae142586304f53cf8
parent188cfa6c9bf279d4fd860d1234c29c86a1f17d57 (diff)
downloadkernel-a98e4a7f91a195d1bf2931df1c1d0b7f624b3836.tar.gz
kernel-a98e4a7f91a195d1bf2931df1c1d0b7f624b3836.tar.xz
kernel-a98e4a7f91a195d1bf2931df1c1d0b7f624b3836.zip
Disable zaurus usb networking.
This should only show up on ARM, but it binds to stuff on Dell laptops too.
-rw-r--r--config-generic3
-rw-r--r--kernel.spec4
2 files changed, 6 insertions, 1 deletions
diff --git a/config-generic b/config-generic
index 6f99259e2..0a9f1ea31 100644
--- a/config-generic
+++ b/config-generic
@@ -3090,7 +3090,8 @@ CONFIG_USB_NET_MCS7830=m
CONFIG_USB_NET_RNDIS_HOST=m
CONFIG_USB_NET_CDC_SUBSET=m
CONFIG_USB_NET_CDC_EEM=m
-CONFIG_USB_NET_ZAURUS=m
+# Zaurus should only show up on ARM platforms, but binds to random shit on Dell laptops.
+# CONFIG_USB_NET_ZAURUS is not set
CONFIG_USB_NET_INT51X1=m
CONFIG_USB_CDC_PHONET=m
CONFIG_USB_IPHETH=m
diff --git a/kernel.spec b/kernel.spec
index a4d1ca2dd..f09c9a06f 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1930,6 +1930,10 @@ fi
# || ||
%changelog
+* Tue Sep 28 2010 Dave Jones <davej@redhat.com>
+- Disable zaurus usb networking.
+ This should only show up on ARM, but it binds to stuff on Dell laptops too.
+
* Fri Sep 24 2010 Chuck Ebbert <cebbert@redhat.com> 2.6.36-0.27.rc5.git6
- Linux 2.6.36-rc5-git6