diff --git a/[refs] b/[refs] index fad13b280e29..8f463024a66e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d41655ee22c8a86c3ebba2a648f11ca4696140de +refs/heads/master: 17e7979f83c1de305fa81efb0aa7a3a56bd8121c diff --git a/trunk/arch/arm/configs/lpc32xx_defconfig b/trunk/arch/arm/configs/lpc32xx_defconfig index e534b5efe803..8fee514ee4b6 100644 --- a/trunk/arch/arm/configs/lpc32xx_defconfig +++ b/trunk/arch/arm/configs/lpc32xx_defconfig @@ -1,4 +1,3 @@ -CONFIG_EXPERIMENTAL=y CONFIG_SYSVIPC=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y