diff options
| author | Michael Neuling <mikey@neuling.org> | 2010-04-18 16:05:41 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-05-21 03:31:12 -0400 |
| commit | 40a5a4435f37b172dec09852ad2036865f9ca3c8 (patch) | |
| tree | d8cace94daf09a05fc28babc943147c3417930f4 /arch | |
| parent | 32c96f7765b881ab1f6ab8ff04b733e4cf157239 (diff) | |
powerpc: Build-in e1000e for pseries & ppc64_defconfig
The e1000e device is becoming more common these days, so let's just
build it in for pseries & ppc64_defconfig.
Signed-off-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/configs/ppc64_defconfig | 2 | ||||
| -rw-r--r-- | arch/powerpc/configs/pseries_defconfig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig index 12980d544654..dad617e2a88c 100644 --- a/arch/powerpc/configs/ppc64_defconfig +++ b/arch/powerpc/configs/ppc64_defconfig | |||
| @@ -988,7 +988,7 @@ CONFIG_ACENIC=m | |||
| 988 | CONFIG_ACENIC_OMIT_TIGON_I=y | 988 | CONFIG_ACENIC_OMIT_TIGON_I=y |
| 989 | # CONFIG_DL2K is not set | 989 | # CONFIG_DL2K is not set |
| 990 | CONFIG_E1000=y | 990 | CONFIG_E1000=y |
| 991 | CONFIG_E1000E=m | 991 | CONFIG_E1000E=y |
| 992 | # CONFIG_IP1000 is not set | 992 | # CONFIG_IP1000 is not set |
| 993 | # CONFIG_IGB is not set | 993 | # CONFIG_IGB is not set |
| 994 | # CONFIG_NS83820 is not set | 994 | # CONFIG_NS83820 is not set |
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig index 41de3ddc9f24..16a14589bd40 100644 --- a/arch/powerpc/configs/pseries_defconfig +++ b/arch/powerpc/configs/pseries_defconfig | |||
| @@ -804,7 +804,7 @@ CONFIG_ACENIC=m | |||
| 804 | CONFIG_ACENIC_OMIT_TIGON_I=y | 804 | CONFIG_ACENIC_OMIT_TIGON_I=y |
| 805 | # CONFIG_DL2K is not set | 805 | # CONFIG_DL2K is not set |
| 806 | CONFIG_E1000=y | 806 | CONFIG_E1000=y |
| 807 | CONFIG_E1000E=m | 807 | CONFIG_E1000E=y |
| 808 | # CONFIG_IP1000 is not set | 808 | # CONFIG_IP1000 is not set |
| 809 | # CONFIG_IGB is not set | 809 | # CONFIG_IGB is not set |
| 810 | # CONFIG_NS83820 is not set | 810 | # CONFIG_NS83820 is not set |