r1014 - trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches

[Joshua Kwan]

Author: joshk
Date: 2004-08-11 12:34:10 -0600 (Wed, 11 Aug 2004)
New Revision: 1014

Modified:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/016_disable_non-free.diff
Log:
fix order of hunks


Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/016_disable_non-free.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/016_disable_non-free.diff	2004-08-11 18:22:52 UTC (rev 1013)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/016_disable_non-free.diff	2004-08-11 18:34:10 UTC (rev 1014)
@@ -72,7 +72,7 @@
     dep_tristate '  USB KOBIL chipcard reader (EXPERIMENTAL)' CONFIG_USB_SERIAL_KOBIL_SCT $CONFIG_USB_SERIAL $CONFIG_EXPERIMENTAL
 --- a/Documentation/Configure.help
 +++ b/Documentation/Configure.help
-@@ -11986,31 +11986,6 @@
+@@ -11931,31 +11931,6 @@
    say M here and read <file:Documentation/modules.txt>.  This is
    recommended.  The module will be called starfire.o.
  
@@ -149,37 +149,6 @@
  3COM 3C359 Token Link Velocity XL PCI adapter support
  CONFIG_3C359
    This is support for the 3Com PCI Velocity XL cards, specifically
-@@ -15975,19 +15919,6 @@
-   about USB bandwidth usage to be logged and some devices or
-   drivers may not work correctly.
- 
--DABUSB driver
--CONFIG_USB_DABUSB
--  A Digital Audio Broadcasting (DAB) Receiver for USB and Linux
--  brought to you by the DAB-Team (<http://dab.in.tum.de/>).  This
--  driver can be taken as an example for URB-based bulk, control, and
--  isochronous transactions. URB's are explained in
--  <file:Documentation/usb/URB.txt>.
--
--  This code is also available as a module ( = code which can be
--  inserted in and removed from the running kernel whenever you want).
--  The module will be called dabusb.o.  If you want to compile it as a
--  module, say M here and read <file:Documentation/modules.txt>.
--
- Host-to-Host USB networking
- CONFIG_USB_USBNET
-   This driver supports network links over USB with USB "Network"
-@@ -26518,10 +26449,6 @@
-   The module will be called io_ti.o.  If you want to compile it
-   as a module, say M here and read <file:Documentation/modules.txt>.
- 
--USB Keyspan MPR Firmware
--CONFIG_USB_SERIAL_KEYSPAN_MPR
--  Say Y here to include firmware for the Keyspan MPR converter.
--
- Winbond W83977AF IrDA Device Driver
- CONFIG_WINBOND_FIR
-   Say Y here if you want to build IrDA support for the Winbond
 @@ -15263,55 +15394,6 @@
    The module will be called keyspan.o. If you want to compile it as a
    module, say M here and read <file:Documentation/modules.txt>.
@@ -236,3 +205,34 @@
  USB ZyXEL omni.net LCD Plus Driver
  CONFIG_USB_SERIAL_OMNINET
    Say Y here if you want to use a ZyXEL omni.net LCD ISDN TA.
+@@ -15975,19 +15919,6 @@
+   about USB bandwidth usage to be logged and some devices or
+   drivers may not work correctly.
+ 
+-DABUSB driver
+-CONFIG_USB_DABUSB
+-  A Digital Audio Broadcasting (DAB) Receiver for USB and Linux
+-  brought to you by the DAB-Team (<http://dab.in.tum.de/>).  This
+-  driver can be taken as an example for URB-based bulk, control, and
+-  isochronous transactions. URB's are explained in
+-  <file:Documentation/usb/URB.txt>.
+-
+-  This code is also available as a module ( = code which can be
+-  inserted in and removed from the running kernel whenever you want).
+-  The module will be called dabusb.o.  If you want to compile it as a
+-  module, say M here and read <file:Documentation/modules.txt>.
+-
+ Host-to-Host USB networking
+ CONFIG_USB_USBNET
+   This driver supports network links over USB with USB "Network"
+@@ -26518,10 +26449,6 @@
+   The module will be called io_ti.o.  If you want to compile it
+   as a module, say M here and read <file:Documentation/modules.txt>.
+ 
+-USB Keyspan MPR Firmware
+-CONFIG_USB_SERIAL_KEYSPAN_MPR
+-  Say Y here to include firmware for the Keyspan MPR converter.
+-
+ Winbond W83977AF IrDA Device Driver
+ CONFIG_WINBOND_FIR
+   Say Y here if you want to build IrDA support for the Winbond