| Submitter | Scott Wood |
|---|---|
| Date | March 12, 2013, 8:03 p.m. |
| Message ID | <20130312200340.GA22145@home.buserror.net> |
| Download | mbox | patch |
| Permalink | /patch/227110/ |
| State | Awaiting Upstream |
| Delegated to: | Kumar Gala |
| Headers | show |
Comments
On Mar 12, 2013, at 3:03 PM, Scott Wood wrote: > This is a commonly used ethernet card, especially with mainline kernels > which lack datapath support.o > > Other changes are due to running savedefconfig. > > Signed-off-by: Scott Wood <scottwood@freescale.com> > --- > > arch/powerpc/configs/corenet64_smp_defconfig | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) fixed up and applied to next - k
Patch
diff --git a/arch/powerpc/configs/corenet64_smp_defconfig b/arch/powerpc/configs/corenet64_smp_defconfig index 3d139fa..37363a3 100644 --- a/arch/powerpc/configs/corenet64_smp_defconfig +++ b/arch/powerpc/configs/corenet64_smp_defconfig @@ -1,14 +1,12 @@ CONFIG_PPC64=y CONFIG_PPC_BOOK3E_64=y -# CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set CONFIG_SMP=y CONFIG_NR_CPUS=2 -CONFIG_EXPERIMENTAL=y CONFIG_SYSVIPC=y -CONFIG_BSD_PROCESS_ACCT=y CONFIG_IRQ_DOMAIN_DEBUG=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y +CONFIG_BSD_PROCESS_ACCT=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=14 @@ -78,6 +76,7 @@ CONFIG_SATA_FSL=y CONFIG_SATA_SIL24=y CONFIG_NETDEVICES=y CONFIG_DUMMY=y +CONFIG_E1000E=y CONFIG_INPUT_FF_MEMLESS=m # CONFIG_INPUT_MOUSEDEV is not set # CONFIG_INPUT_KEYBOARD is not set @@ -140,6 +139,5 @@ CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_MD4=y CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_SHA512=y -CONFIG_CRYPTO_AES=y # CONFIG_CRYPTO_ANSI_CPRNG is not set CONFIG_CRYPTO_DEV_FSL_CAAM=y
This is a commonly used ethernet card, especially with mainline kernels which lack datapath support.o Other changes are due to running savedefconfig. Signed-off-by: Scott Wood <scottwood@freescale.com> --- arch/powerpc/configs/corenet64_smp_defconfig | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)