diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-18 16:20:16 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-18 16:20:16 -0500 |
| commit | b4ea75b649417606fd6b38710a2962ec9770e772 (patch) | |
| tree | 217727bea3813e154dee942a3c835933de26acee /arch/powerpc/configs/ppc64_defconfig | |
| parent | 2baeaaa4dab6b43e35c7150d5350bfaff1284153 (diff) | |
| parent | 7c4d33675f81fa38f85eeabbbf3e7b8687c15cc3 (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'arch/powerpc/configs/ppc64_defconfig')
| -rw-r--r-- | arch/powerpc/configs/ppc64_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig index 0b2b55a79c3c..6f6c6bed1aa5 100644 --- a/arch/powerpc/configs/ppc64_defconfig +++ b/arch/powerpc/configs/ppc64_defconfig | |||
| @@ -724,6 +724,7 @@ CONFIG_ACENIC_OMIT_TIGON_I=y | |||
| 724 | # CONFIG_DL2K is not set | 724 | # CONFIG_DL2K is not set |
| 725 | CONFIG_E1000=y | 725 | CONFIG_E1000=y |
| 726 | # CONFIG_E1000_NAPI is not set | 726 | # CONFIG_E1000_NAPI is not set |
| 727 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | ||
| 727 | # CONFIG_NS83820 is not set | 728 | # CONFIG_NS83820 is not set |
| 728 | # CONFIG_HAMACHI is not set | 729 | # CONFIG_HAMACHI is not set |
| 729 | # CONFIG_YELLOWFIN is not set | 730 | # CONFIG_YELLOWFIN is not set |