diff options
| author | Tony Lindgren <tony@atomide.com> | 2015-11-25 21:56:40 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2015-11-25 21:56:40 +0300 |
| commit | 970259bff472579204108c6f27036ec4d1206ae1 (patch) | |
| tree | 869bdcda9aac4c67712d93e6141056fdf3f41bd8 /arch/mips/configs/mpc30x_defconfig | |
| parent | 9b1b61cd8e31d9beba871333d7a798b3adb89288 (diff) | |
| parent | 29f5b34ca1a191c2cf4f6c8c12f4dec56e8d3bc1 (diff) | |
| download | linux-970259bff472579204108c6f27036ec4d1206ae1.tar.xz | |
Merge branch '81xx' into omap-for-v4.4/fixes
Diffstat (limited to 'arch/mips/configs/mpc30x_defconfig')
| -rw-r--r-- | arch/mips/configs/mpc30x_defconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/configs/mpc30x_defconfig b/arch/mips/configs/mpc30x_defconfig index 7a346605c498..a2c045fab6c5 100644 --- a/arch/mips/configs/mpc30x_defconfig +++ b/arch/mips/configs/mpc30x_defconfig @@ -27,9 +27,9 @@ CONFIG_INET_XFRM_MODE_BEET=m CONFIG_NETWORK_SECMARK=y CONFIG_CONNECTOR=m CONFIG_ATA_OVER_ETH=m -# CONFIG_MISC_DEVICES is not set -CONFIG_IDE=y -CONFIG_IDE_GENERIC=y +CONFIG_BLK_DEV_SD=y +CONFIG_ATA=y +CONFIG_PATA_LEGACY=y CONFIG_NETDEVICES=y # CONFIG_NETDEV_1000 is not set # CONFIG_NETDEV_10000 is not set |