diff --git a/debian/changelog b/debian/changelog index 133bd9e97..0860fa092 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,7 +30,7 @@ linux-2.6 (2.6.29~rc8-1~experimental.1) UNRELEASED; urgency=low 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, diff --git a/debian/config/config b/debian/config/config index df20a226a..39c99cae9 100644 --- a/debian/config/config +++ b/debian/config/config @@ -1286,6 +1286,11 @@ CONFIG_IPDDP=m CONFIG_IPDDP_ENCAP=y CONFIG_IPDDP_DECAP=y +## +## file: drivers/net/benet/Kconfig +## +CONFIG_BE2NET=m + ## ## file: drivers/net/can/Kconfig ## @@ -1834,11 +1839,6 @@ CONFIG_STAGING=y ## CONFIG_USB_ATMEL=m -## -## file: drivers/staging/benet/Kconfig -## -# CONFIG_BENET is not set - ## ## file: drivers/staging/comedi/Kconfig ##