diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-05-02 19:20:03 +0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-02 19:21:21 +0400 |
commit | 87c35c56f4beed9e43bd41427643215655a31c3d (patch) | |
tree | a4a29370bbb16ecf1864751def0a9b7ad0629476 /arch/m68k/configs/m5275evb_defconfig | |
parent | d1ef5bd711b6b01e6a73cf186245d19939882706 (diff) | |
parent | ee9581d7adaeb2d04b01e3567e2355ceb5f43ad1 (diff) | |
download | linux-87c35c56f4beed9e43bd41427643215655a31c3d.tar.xz |
Merge branch 'ux500-u9540-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/newsoc
From: Linus Walleij <linus.walleij@linaro.org>:
Core support for the U9540 after finalized review
* 'ux500-u9540-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson: (2 commits)
ARM: ux500: ioremap differences for DB9540
ARM: ux500: core U9540 support
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/m68k/configs/m5275evb_defconfig')
-rw-r--r-- | arch/m68k/configs/m5275evb_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/m68k/configs/m5275evb_defconfig b/arch/m68k/configs/m5275evb_defconfig index 33c32aeca12b..a1230e82bb1e 100644 --- a/arch/m68k/configs/m5275evb_defconfig +++ b/arch/m68k/configs/m5275evb_defconfig @@ -49,7 +49,6 @@ CONFIG_BLK_DEV_RAM=y CONFIG_NETDEVICES=y CONFIG_NET_ETHERNET=y CONFIG_FEC=y -CONFIG_FEC2=y # CONFIG_NETDEV_1000 is not set # CONFIG_NETDEV_10000 is not set CONFIG_PPP=y |