Merge branch 'rmobile' of git://git.denx.de/u-boot-sh

diff --git a/configs/armadillo-800eva_defconfig b/configs/armadillo-800eva_defconfig
index 9b17895623b4e9337829a6080f3e7596543f6ea1..22dc1f8a4175ddeacdfc14711c064ff48d4a31a5 100644 (file)
--- a/configs/armadillo-800eva_defconfig
+++ b/configs/armadillo-800eva_defconfig
@@ -1,3 +1,3 @@
 CONFIG_ARM=y
-+S:CONFIG_RMOBILE=y
+CONFIG_RMOBILE=y
 CONFIG_TARGET_ARMADILLO_800EVA=y

diff --git a/configs/kzm9g_defconfig b/configs/kzm9g_defconfig
index d4d340f4bd96031a1a187bd7c60987b434ad5f73..20656dd61dd10e35656f0690df3157cdbbd8156f 100644 (file)
--- a/configs/kzm9g_defconfig
+++ b/configs/kzm9g_defconfig
@@ -1,3 +1,3 @@
 CONFIG_ARM=y
-+S:CONFIG_RMOBILE=y
+CONFIG_RMOBILE=y
 CONFIG_TARGET_KZM9G=y