git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[pandora-kernel.git]
/
arch
/
ppc
/
configs
/
katana_defconfig
diff --git
a/arch/ppc/configs/katana_defconfig
b/arch/ppc/configs/katana_defconfig
index
0f3bb9a
..
7311fe6
100644
(file)
--- a/
arch/ppc/configs/katana_defconfig
+++ b/
arch/ppc/configs/katana_defconfig
@@
-488,6
+488,7
@@
CONFIG_E100=y
# CONFIG_DL2K is not set
CONFIG_E1000=y
# CONFIG_E1000_NAPI is not set
+# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
# CONFIG_NS83820 is not set
# CONFIG_HAMACHI is not set
# CONFIG_YELLOWFIN is not set