[kernel] r8322 - in dists/trunk/linux-2.6/debian: . arch

[Frederik Schüler]

Author: fs
Date: Fri Feb 23 13:43:51 2007
New Revision: 8322

Modified:
   dists/trunk/linux-2.6/debian/arch/config
   dists/trunk/linux-2.6/debian/changelog
Log:
Disabe NAPI on forcedeth, it is broken.


Modified: dists/trunk/linux-2.6/debian/arch/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/config	Fri Feb 23 13:43:51 2007
@@ -1177,7 +1177,6 @@
 CONFIG_TOUCHSCREEN_PENMOUNT=m
 CONFIG_VIDEO_TDA9840=m
 CONFIG_PATA_ATIIXP=m
-CONFIG_FORCEDETH_NAPI=y
 CONFIG_GFS2_FS_LOCKING_NOLOCK=m
 CONFIG_SCSI_NETLINK=y
 CONFIG_USB_PHIDGET=m
@@ -1340,3 +1339,4 @@
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_WAN_ROUTER_DRIVERS=m
+# CONFIG_FORCEDETH_NAPI is not set

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Fri Feb 23 13:43:51 2007
@@ -29,7 +29,10 @@
   [ Gordon Farquharson ]
   * Disable broken config options on ARM.
 
- -- maximilian attems <maks at sternwelten.at>  Tue, 30 Jan 2007 09:32:00 +0100
+  [ Frederik Schüler ]
+  * Disable NAPI on forcedeth, it is broken.
+
+ -- Frederik Schüler <fs at debian.org>  Fri, 23 Feb 2007 13:43:07 +0100
 
 linux-2.6 (2.6.18.dfsg.1-10) unstable; urgency=low