[kernel] r7234 - in dists/sid/linux-2.6/debian: patches

[maximilian attems]

Author: maks-guest
Date: Thu Aug 24 09:51:01 2006
New Revision: 7234

Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/2.6.17.11

Log:
back out wrong patch from stable 2.6.17.11


Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Thu Aug 24 09:51:01 2006
@@ -37,7 +37,6 @@
     - ulog: fix panic on SMP kernels
     - dm: BUG/OOPS fix
     - MD: Fix a potential NULL dereference in md/raid1
-    - SERIAL: icom: select FW_LOADER
     - ip_tables: fix table locking in ipt_do_table
     - swsusp: Fix swap_type_of
     - sky2: phy power problem on 88e805x
@@ -52,7 +51,7 @@
   * Add Apple MacBook product IDs to usbhid and set
     CONFIG_USB_HIDINPUT_POWERBOOK=y on i386 and amd64. (closes: #383620)
 
- -- maximilian attems <maks at sternwelten.at>  Wed, 23 Aug 2006 23:44:47 +0200
+ -- maximilian attems <maks at sternwelten.at>  Thu, 24 Aug 2006 11:49:54 +0200
 
 linux-2.6 (2.6.17-6) unstable; urgency=low
 

Modified: dists/sid/linux-2.6/debian/patches/2.6.17.11
==============================================================================
--- dists/sid/linux-2.6/debian/patches/2.6.17.11	(original)
+++ dists/sid/linux-2.6/debian/patches/2.6.17.11	Thu Aug 24 09:51:01 2006
@@ -277,18 +277,6 @@
  
  static void __init asus_hides_smbus_lpc_ich6(struct pci_dev *dev)
  {
-diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
-index 7d22dc0..753b364 100644
---- a/drivers/serial/Kconfig
-+++ b/drivers/serial/Kconfig
-@@ -803,6 +803,7 @@ config SERIAL_MPC52xx
- 	tristate "Freescale MPC52xx family PSC serial support"
- 	depends on PPC_MPC52xx
- 	select SERIAL_CORE
-+	select FW_LOADER
- 	help
- 	  This drivers support the MPC52xx PSC serial ports. If you would
- 	  like to use them, you must answer Y or M to this option. Not that
 diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c
 index 68ebd10..aa50dc6 100644
 --- a/fs/befs/linuxvfs.c