[kernel] r13175 - in dists/trunk/linux-2.6/debian: . config

[Maximilian Attems]

Author: maks
Date: Thu Mar 19 23:06:13 2009
New Revision: 13175

Log:
benet got merged into proper drivers/net from staging

remove old staging ref and enable the new variable.

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Thu Mar 19 23:06:13 2009
@@ -30,7 +30,7 @@
     BTRFS_FS_POSIX_ACL, ATM_SOLOS, MFD_PCF50633, PCF50633_ADC, PCF50633_GPIO,
     REGULATOR_PCF50633, DVB_S921, EDAC_I5400, RTC_DRV_PCF50633,
     INPUT_PCF50633_PMU, CHARGER_PCF50633, DEVPTS_MULTIPLE_INSTANCES,
-    SCHED_OMIT_FRAME_POINTER, DCB, IXGBE_DCB, SFC_MTD.
+    SCHED_OMIT_FRAME_POINTER, DCB, IXGBE_DCB, SFC_MTD, BE2NET.
   * topconfig enable SND_HDA_HWDEP for sound debugging purpose.
   * topconfig enable USB_HIDDEV (closes: #517771)
   * [x86] set DELL_LAPTOP, COMEDI, X86_PTRACE_BTS, XENFS, XEN_COMPAT_XENFS,

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	(original)
+++ dists/trunk/linux-2.6/debian/config/config	Thu Mar 19 23:06:13 2009
@@ -1287,6 +1287,11 @@
 CONFIG_IPDDP_DECAP=y
 
 ##
+## file: drivers/net/benet/Kconfig
+##
+CONFIG_BE2NET=m
+
+##
 ## file: drivers/net/can/Kconfig
 ##
 CONFIG_CAN_VCAN=m
@@ -1835,11 +1840,6 @@
 CONFIG_USB_ATMEL=m
 
 ##
-## file: drivers/staging/benet/Kconfig
-##
-# CONFIG_BENET is not set
-
-##
 ## file: drivers/staging/comedi/Kconfig
 ##
 # CONFIG_COMEDI is not set