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 | |
| 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')
| -rw-r--r-- | arch/arm/configs/ep80219_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/iq31244_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/iq80321_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/iq80331_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/iq80332_defconfig | 1 |
5 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/configs/ep80219_defconfig b/arch/arm/configs/ep80219_defconfig index fbe312e..3c73b70 100644 --- a/arch/arm/configs/ep80219_defconfig +++ b/arch/arm/configs/ep80219_defconfig @@ -522,6 +522,7 @@ CONFIG_E100=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 diff --git a/arch/arm/configs/iq31244_defconfig b/arch/arm/configs/iq31244_defconfig index c07628c..3246716 100644 --- a/arch/arm/configs/iq31244_defconfig +++ b/arch/arm/configs/iq31244_defconfig @@ -493,6 +493,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 diff --git a/arch/arm/configs/iq80321_defconfig b/arch/arm/configs/iq80321_defconfig index 18fa161..b000da7 100644 --- a/arch/arm/configs/iq80321_defconfig +++ b/arch/arm/configs/iq80321_defconfig @@ -415,6 +415,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 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 diff --git a/arch/arm/configs/iq80332_defconfig b/arch/arm/configs/iq80332_defconfig index 18b3f37..11959b7 100644 --- a/arch/arm/configs/iq80332_defconfig +++ b/arch/arm/configs/iq80332_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 |