diff options
| author | Dave Jones <davej@redhat.com> | 2010-09-28 12:59:32 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2010-09-28 12:59:32 -0400 |
| commit | 4539bcb0e29f9eb8810b1b9edd7904f758e1a184 (patch) | |
| tree | d00874cdf45193576b30e2807dd5fc95a7da736d | |
| parent | a98e4a7f91a195d1bf2931df1c1d0b7f624b3836 (diff) | |
| download | kernel-4539bcb0e29f9eb8810b1b9edd7904f758e1a184.tar.gz kernel-4539bcb0e29f9eb8810b1b9edd7904f758e1a184.tar.xz kernel-4539bcb0e29f9eb8810b1b9edd7904f758e1a184.zip | |
Revert "Disable zaurus usb networking."
This reverts commit a98e4a7f91a195d1bf2931df1c1d0b7f624b3836.
| -rw-r--r-- | config-generic | 3 | ||||
| -rw-r--r-- | kernel.spec | 4 |
2 files changed, 1 insertions, 6 deletions
diff --git a/config-generic b/config-generic index 0a9f1ea31..6f99259e2 100644 --- a/config-generic +++ b/config-generic @@ -3090,8 +3090,7 @@ CONFIG_USB_NET_MCS7830=m CONFIG_USB_NET_RNDIS_HOST=m CONFIG_USB_NET_CDC_SUBSET=m CONFIG_USB_NET_CDC_EEM=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_ZAURUS=m CONFIG_USB_NET_INT51X1=m CONFIG_USB_CDC_PHONET=m CONFIG_USB_IPHETH=m diff --git a/kernel.spec b/kernel.spec index f09c9a06f..a4d1ca2dd 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1930,10 +1930,6 @@ 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 |