diff --git a/[refs] b/[refs]
index d6602add4307..8af5df5bef62 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e0ef0984ae346c545f5d76ecbe929c3d4adda157
+refs/heads/master: db30abdf3c07c564d4af0f991bb7f38b728f9035
diff --git a/trunk/arch/arm/configs/marzen_defconfig b/trunk/arch/arm/configs/marzen_defconfig
index afb17d630d44..8e7329b3ebaf 100644
--- a/trunk/arch/arm/configs/marzen_defconfig
+++ b/trunk/arch/arm/configs/marzen_defconfig
@@ -49,6 +49,10 @@ CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_FW_LOADER is not set
 CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
+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