diff mbox

[2/2] ARM: mach-shmobile: marzen: add SATA support

Message ID 201305120126.55306.sergei.shtylyov@cogentembedded.com (mailing list archive)
State New, archived
Headers show

Commit Message

Sergei Shtylyov May 11, 2013, 9:26 p.m. UTC 
From: Vladimir Barinov <vladimir.barinov@cogentembedded.com>

Add SATA support to marzen_defconfig.

Signed-off-by: Vladimir Barinov <vladimir.barinov@cogentembedded.com>
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit db30abdf3c07c564d4af0f991bb7f38b728f9035)

---
This patch (already merged by Linus) is intended for the Marzen patch series.

Changes from the upstream version:
- resolved reject due to missing interim patches.

 arch/arm/configs/marzen_defconfig |    4 ++++
 1 file changed, 4 insertions(+)
diff mbox

Patch

Index: linux-3.4.39/arch/arm/configs/marzen_defconfig
===================================================================
--- linux-3.4.39.orig/arch/arm/configs/marzen_defconfig
+++ linux-3.4.39/arch/arm/configs/marzen_defconfig
@@ -47,6 +47,10 @@  CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
 # CONFIG_FW_LOADER is not set
+CONFIG_ATA=y
+CONFIG_ATA_SFF=y
+CONFIG_ATA_BMDMA=y
+CONFIG_SATA_RCAR=y
 CONFIG_NETDEVICES=y
 # CONFIG_NET_VENDOR_BROADCOM is not set
 # CONFIG_NET_VENDOR_FARADAY is not set