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 +- 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 2.6.36-0.27.rc5.git6 - Linux 2.6.36-rc5-git6