Merge tag 'at91-cleanup2' of git://github.com/at91linux/linux-at91 into next/cleanup

[~andy/linux] / arch / arm / configs / at91sam9260_9g20_defconfig

diff --git a/arch/arm/configs/at91sam9260_9g20_defconfig b/arch/arm/configs/at91sam9260_9g20_defconfig
index 9c4afd3fa63b60bb085d78359f1a825415256c1a..2cd832918e9ccb7a51d9893c2c6f4e17366b284d 100644 (file)
--- a/arch/arm/configs/at91sam9260_9g20_defconfig
+++ b/arch/arm/configs/at91sam9260_9g20_defconfig
@@ -27,7 +27,6 @@ CONFIG_MACH_PCONTROL_G20=y
 CONFIG_MACH_GSIA18S=y
 CONFIG_MACH_SNAPPER_9260=y
 CONFIG_MACH_AT91SAM9_DT=y
-CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
 CONFIG_AT91_SLOW_CLOCK=y
 # CONFIG_ARM_THUMB is not set
 CONFIG_AEABI=y