r3405 - branches/linux-kernel-2.6.12/debian/patches-debian

Jurij Smakov jurij-guest@costa.debian.org
Sun, 26 Jun 2005 21:25:33 +0000


Author: jurij-guest
Date: 2005-06-26 21:25:33 +0000 (Sun, 26 Jun 2005)
New Revision: 3405

Modified:
   branches/linux-kernel-2.6.12/debian/patches-debian/remove-references-to-removed-drivers.patch
Log:
Remove parts of the patch affecting the parisc
defconfig files, as they are causing the parisc
patch not to apply.


Modified: branches/linux-kernel-2.6.12/debian/patches-debian/remove-references-to-removed-drivers.patch
===================================================================
--- branches/linux-kernel-2.6.12/debian/patches-debian/remove-references-to-removed-drivers.patch	2005-06-26 21:20:23 UTC (rev 3404)
+++ branches/linux-kernel-2.6.12/debian/patches-debian/remove-references-to-removed-drivers.patch	2005-06-26 21:25:33 UTC (rev 3405)
@@ -125,54 +125,6 @@
  CONFIG_USB_AUERSWALD=m
  CONFIG_USB_RIO500=m
  CONFIG_USB_LEGOTOWER=m
-diff -aurN a/arch/parisc/configs/c3000_defconfig b/arch/parisc/configs/c3000_defconfig
---- a/arch/parisc/configs/c3000_defconfig	2005-06-17 15:48:29.000000000 -0400
-+++ b/arch/parisc/configs/c3000_defconfig	2005-06-18 16:30:26.000000000 -0400
-@@ -892,8 +892,6 @@
- #
- # USB Miscellaneous drivers
- #
--# CONFIG_USB_EMI62 is not set
--# CONFIG_USB_EMI26 is not set
- # CONFIG_USB_TIGL is not set
- # CONFIG_USB_AUERSWALD is not set
- # CONFIG_USB_RIO500 is not set
-diff -aurN a/arch/parisc/defconfig b/arch/parisc/defconfig
---- a/arch/parisc/defconfig	2005-06-17 15:48:29.000000000 -0400
-+++ b/arch/parisc/defconfig	2005-06-18 16:30:45.000000000 -0400
-@@ -345,7 +345,6 @@
- # CONFIG_AC3200 is not set
- # CONFIG_B44 is not set
- # CONFIG_FORCEDETH is not set
--# CONFIG_DGRS is not set
- # CONFIG_EEPRO100 is not set
- # CONFIG_E100 is not set
- # CONFIG_LNE390 is not set
-@@ -365,7 +364,6 @@
- #
- # Ethernet (1000 Mbit)
- #
--# CONFIG_ACENIC is not set
- CONFIG_DL2K=y
- # CONFIG_E1000 is not set
- # CONFIG_NS83820 is not set
-@@ -702,7 +700,6 @@
- #
- # USB Multimedia devices
- #
--# CONFIG_USB_DABUSB is not set
- 
- #
- # Video4Linux support is needed for USB Multimedia device support
-@@ -730,8 +727,6 @@
- #
- # USB Miscellaneous drivers
- #
--# CONFIG_USB_EMI62 is not set
--# CONFIG_USB_EMI26 is not set
- # CONFIG_USB_TIGL is not set
- # CONFIG_USB_AUERSWALD is not set
- # CONFIG_USB_RIO500 is not set
 diff -aurN a/arch/ppc/configs/common_defconfig b/arch/ppc/configs/common_defconfig
 --- a/arch/ppc/configs/common_defconfig	2005-06-17 15:48:29.000000000 -0400
 +++ b/arch/ppc/configs/common_defconfig	2005-06-18 16:24:38.000000000 -0400