benet got merged into proper drivers/net from staging
remove old staging ref and enable the new variable. svn path=/dists/trunk/linux-2.6/; revision=13175
This commit is contained in:
parent
256bc08e11
commit
e12d3311e4
|
@ -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,
|
BTRFS_FS_POSIX_ACL, ATM_SOLOS, MFD_PCF50633, PCF50633_ADC, PCF50633_GPIO,
|
||||||
REGULATOR_PCF50633, DVB_S921, EDAC_I5400, RTC_DRV_PCF50633,
|
REGULATOR_PCF50633, DVB_S921, EDAC_I5400, RTC_DRV_PCF50633,
|
||||||
INPUT_PCF50633_PMU, CHARGER_PCF50633, DEVPTS_MULTIPLE_INSTANCES,
|
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 SND_HDA_HWDEP for sound debugging purpose.
|
||||||
* topconfig enable USB_HIDDEV (closes: #517771)
|
* topconfig enable USB_HIDDEV (closes: #517771)
|
||||||
* [x86] set DELL_LAPTOP, COMEDI, X86_PTRACE_BTS, XENFS, XEN_COMPAT_XENFS,
|
* [x86] set DELL_LAPTOP, COMEDI, X86_PTRACE_BTS, XENFS, XEN_COMPAT_XENFS,
|
||||||
|
|
|
@ -1286,6 +1286,11 @@ CONFIG_IPDDP=m
|
||||||
CONFIG_IPDDP_ENCAP=y
|
CONFIG_IPDDP_ENCAP=y
|
||||||
CONFIG_IPDDP_DECAP=y
|
CONFIG_IPDDP_DECAP=y
|
||||||
|
|
||||||
|
##
|
||||||
|
## file: drivers/net/benet/Kconfig
|
||||||
|
##
|
||||||
|
CONFIG_BE2NET=m
|
||||||
|
|
||||||
##
|
##
|
||||||
## file: drivers/net/can/Kconfig
|
## file: drivers/net/can/Kconfig
|
||||||
##
|
##
|
||||||
|
@ -1834,11 +1839,6 @@ CONFIG_STAGING=y
|
||||||
##
|
##
|
||||||
CONFIG_USB_ATMEL=m
|
CONFIG_USB_ATMEL=m
|
||||||
|
|
||||||
##
|
|
||||||
## file: drivers/staging/benet/Kconfig
|
|
||||||
##
|
|
||||||
# CONFIG_BENET is not set
|
|
||||||
|
|
||||||
##
|
##
|
||||||
## file: drivers/staging/comedi/Kconfig
|
## file: drivers/staging/comedi/Kconfig
|
||||||
##
|
##
|
||||||
|
|
Loading…
Reference in New Issue