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 'clk' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux...
[pandora-kernel.git]
/
arch
/
powerpc
/
configs
/
ppc44x_defconfig
diff --git
a/arch/powerpc/configs/ppc44x_defconfig
b/arch/powerpc/configs/ppc44x_defconfig
index
4713320
..
6cdf1c0
100644
(file)
--- a/
arch/powerpc/configs/ppc44x_defconfig
+++ b/
arch/powerpc/configs/ppc44x_defconfig
@@
-63,8
+63,9
@@
CONFIG_BLK_DEV_SD=m
# CONFIG_SCSI_LOWLEVEL is not set
CONFIG_NETDEVICES=y
CONFIG_TUN=m
-CONFIG_NET_ETHERNET=y
-CONFIG_IBM_NEW_EMAC=y
+CONFIG_ETHERNET=y
+CONFIG_NET_VENDOR_IBM=y
+CONFIG_IBM_EMAC=y
# CONFIG_INPUT is not set
CONFIG_SERIO=m
# CONFIG_SERIO_I8042 is not set