diff --git a/[refs] b/[refs]
index 627da786713f..1f9d18e4bf22 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2fd73eb62bcf28ee1f1afa47b9e7cf88494d0da1
+refs/heads/master: 686fad5c3a5409eababf4543f0ecfea3be73ac72
diff --git a/trunk/arch/arm/configs/multi_v7_defconfig b/trunk/arch/arm/configs/multi_v7_defconfig
index 2eeff1e64b6e..6862e7692191 100644
--- a/trunk/arch/arm/configs/multi_v7_defconfig
+++ b/trunk/arch/arm/configs/multi_v7_defconfig
@@ -39,7 +39,6 @@ CONFIG_I2C=y
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_SPI=y
 CONFIG_SPI_PL022=y
-CONFIG_GPIOLIB=y
 CONFIG_FB=y
 CONFIG_FB_ARMCLCD=y
 CONFIG_FRAMEBUFFER_CONSOLE=y