diff --git a/[refs] b/[refs]
index 08a3c5143375..b13a6ad8d1fe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 202fae9b082b326ce9771f4daac65d22a7421d09
+refs/heads/master: f1f6ac111d6b1c55a604afbbff966e284b392050
diff --git a/trunk/arch/arm/configs/spear600_defconfig b/trunk/arch/arm/configs/spear6xx_defconfig
similarity index 97%
rename from trunk/arch/arm/configs/spear600_defconfig
rename to trunk/arch/arm/configs/spear6xx_defconfig
index 6777c11f63e7..cef2e836afd2 100644
--- a/trunk/arch/arm/configs/spear600_defconfig
+++ b/trunk/arch/arm/configs/spear6xx_defconfig
@@ -8,6 +8,7 @@ CONFIG_MODULE_UNLOAD=y
 CONFIG_MODVERSIONS=y
 CONFIG_PLAT_SPEAR=y
 CONFIG_ARCH_SPEAR6XX=y
+CONFIG_BOARD_SPEAR600_EVB=y
 CONFIG_BINFMT_MISC=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_BLK_DEV_RAM=y
@@ -22,7 +23,6 @@ CONFIG_MAX_RAW_DEVS=8192
 CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_PL061=y
 # CONFIG_HWMON is not set
-# CONFIG_VGA_CONSOLE is not set
 # CONFIG_HID_SUPPORT is not set
 # CONFIG_USB_SUPPORT is not set
 CONFIG_EXT2_FS=y