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.infradead.org/users/linville/wireless-next into...
[pandora-kernel.git]
/
arch
/
powerpc
/
configs
/
44x
/
katmai_defconfig
diff --git
a/arch/powerpc/configs/44x/katmai_defconfig
b/arch/powerpc/configs/44x/katmai_defconfig
index
34c0914
..
109562c
100644
(file)
--- a/
arch/powerpc/configs/44x/katmai_defconfig
+++ b/
arch/powerpc/configs/44x/katmai_defconfig
@@
-42,8
+42,9
@@
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_SIZE=35000
CONFIG_MACINTOSH_DRIVERS=y
CONFIG_NETDEVICES=y
CONFIG_BLK_DEV_RAM_SIZE=35000
CONFIG_MACINTOSH_DRIVERS=y
CONFIG_NETDEVICES=y
-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 is not set
# CONFIG_VT is not set
# CONFIG_INPUT is not set
# CONFIG_SERIO is not set
# CONFIG_VT is not set