Merge branch 'uhid' into for-linus

[karo-tx-linux.git] / arch / arm / mach-at91 / Kconfig

diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 98a42f3472d52670cef9850d50f88b51c173ee95..19505c0a3f018225dcdc4935e089024e8d03d670 100644 (file)
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -91,6 +91,14 @@ config SOC_AT91SAM9X5
          This support covers AT91SAM9G15, AT91SAM9G25, AT91SAM9X25, AT91SAM9G35
          and AT91SAM9X35.
 
+config SOC_AT91SAM9N12
+       bool "AT91SAM9N12 family"
+       select SOC_AT91SAM9
+       select HAVE_AT91_DBGU0
+       select HAVE_FB_ATMEL
+       help
+         Select this if you are using Atmel's AT91SAM9N12 SoC.
+
 choice
        prompt "Atmel AT91 Processor Devices for non DT boards"