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/arm/configs/iq80331_defconfig | |
parent | 2baeaaa4dab6b43e35c7150d5350bfaff1284153 (diff) | |
parent | 7c4d33675f81fa38f85eeabbbf3e7b8687c15cc3 (diff) | |
download | kernel_samsung_smdk4412-b4ea75b649417606fd6b38710a2962ec9770e772.zip kernel_samsung_smdk4412-b4ea75b649417606fd6b38710a2962ec9770e772.tar.gz kernel_samsung_smdk4412-b4ea75b649417606fd6b38710a2962ec9770e772.tar.bz2 |
Merge branch 'upstream-fixes'
Diffstat (limited to 'arch/arm/configs/iq80331_defconfig')
-rw-r--r-- | arch/arm/configs/iq80331_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/iq80331_defconfig b/arch/arm/configs/iq80331_defconfig index f50035d..46c79e1 100644 --- a/arch/arm/configs/iq80331_defconfig +++ b/arch/arm/configs/iq80331_defconfig @@ -496,6 +496,7 @@ CONFIG_NETDEVICES=y # CONFIG_DL2K is not set CONFIG_E1000=y CONFIG_E1000_NAPI=y +# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set # CONFIG_NS83820 is not set # CONFIG_HAMACHI is not set # CONFIG_YELLOWFIN is not set |