diff options
| author | Nicolas Ferre <nicolas.ferre@atmel.com> | 2009-06-23 10:30:56 -0400 |
|---|---|---|
| committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2009-11-16 10:56:23 -0500 |
| commit | 0912e5359f89f303f53fd4874dadab77a4949a8a (patch) | |
| tree | 720d2f12f0293229c4ebd085b159cd0ad4da2dd1 /arch | |
| parent | 2ef9f59a7a3a0894be63836542f0902a45ffdd22 (diff) | |
atmel_lcdfb Kconfig: remove long dependency line
Many Atmel SOC are embedding a LCD controller. This patch removes the long
dependency line for this Atmel LCD framebuffer driver configuration entry.
The HAVE_FB_ATMEL configuration option is located in the video Kconfig file
as it may be setup by ARM/AT91 and AVR32 chips.
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: Andrew Victor <linux@maxim.org.za>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-at91/Kconfig | 6 | ||||
| -rw-r--r-- | arch/avr32/Kconfig | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index bb4cd27c322f..3df124e54267 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig | |||
| @@ -41,18 +41,21 @@ config ARCH_AT91SAM9261 | |||
| 41 | select CPU_ARM926T | 41 | select CPU_ARM926T |
| 42 | select GENERIC_TIME | 42 | select GENERIC_TIME |
| 43 | select GENERIC_CLOCKEVENTS | 43 | select GENERIC_CLOCKEVENTS |
| 44 | select HAVE_FB_ATMEL | ||
| 44 | 45 | ||
| 45 | config ARCH_AT91SAM9G10 | 46 | config ARCH_AT91SAM9G10 |
| 46 | bool "AT91SAM9G10" | 47 | bool "AT91SAM9G10" |
| 47 | select CPU_ARM926T | 48 | select CPU_ARM926T |
| 48 | select GENERIC_TIME | 49 | select GENERIC_TIME |
| 49 | select GENERIC_CLOCKEVENTS | 50 | select GENERIC_CLOCKEVENTS |
| 51 | select HAVE_FB_ATMEL | ||
| 50 | 52 | ||
| 51 | config ARCH_AT91SAM9263 | 53 | config ARCH_AT91SAM9263 |
| 52 | bool "AT91SAM9263" | 54 | bool "AT91SAM9263" |
| 53 | select CPU_ARM926T | 55 | select CPU_ARM926T |
| 54 | select GENERIC_TIME | 56 | select GENERIC_TIME |
| 55 | select GENERIC_CLOCKEVENTS | 57 | select GENERIC_CLOCKEVENTS |
| 58 | select HAVE_FB_ATMEL | ||
| 56 | 59 | ||
| 57 | config ARCH_AT91SAM9RL | 60 | config ARCH_AT91SAM9RL |
| 58 | bool "AT91SAM9RL" | 61 | bool "AT91SAM9RL" |
| @@ -60,6 +63,7 @@ config ARCH_AT91SAM9RL | |||
| 60 | select GENERIC_TIME | 63 | select GENERIC_TIME |
| 61 | select GENERIC_CLOCKEVENTS | 64 | select GENERIC_CLOCKEVENTS |
| 62 | select HAVE_AT91_USART3 | 65 | select HAVE_AT91_USART3 |
| 66 | select HAVE_FB_ATMEL | ||
| 63 | 67 | ||
| 64 | config ARCH_AT91SAM9G20 | 68 | config ARCH_AT91SAM9G20 |
| 65 | bool "AT91SAM9G20" | 69 | bool "AT91SAM9G20" |
| @@ -76,12 +80,14 @@ config ARCH_AT91SAM9G45 | |||
| 76 | select GENERIC_TIME | 80 | select GENERIC_TIME |
| 77 | select GENERIC_CLOCKEVENTS | 81 | select GENERIC_CLOCKEVENTS |
| 78 | select HAVE_AT91_USART3 | 82 | select HAVE_AT91_USART3 |
| 83 | select HAVE_FB_ATMEL | ||
| 79 | 84 | ||
| 80 | config ARCH_AT91CAP9 | 85 | config ARCH_AT91CAP9 |
| 81 | bool "AT91CAP9" | 86 | bool "AT91CAP9" |
| 82 | select CPU_ARM926T | 87 | select CPU_ARM926T |
| 83 | select GENERIC_TIME | 88 | select GENERIC_TIME |
| 84 | select GENERIC_CLOCKEVENTS | 89 | select GENERIC_CLOCKEVENTS |
| 90 | select HAVE_FB_ATMEL | ||
| 85 | 91 | ||
| 86 | config ARCH_AT91X40 | 92 | config ARCH_AT91X40 |
| 87 | bool "AT91x40" | 93 | bool "AT91x40" |
diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig index 35e3bd9858df..d856354f4272 100644 --- a/arch/avr32/Kconfig +++ b/arch/avr32/Kconfig | |||
| @@ -92,6 +92,7 @@ config PLATFORM_AT32AP | |||
| 92 | select PERFORMANCE_COUNTERS | 92 | select PERFORMANCE_COUNTERS |
| 93 | select ARCH_REQUIRE_GPIOLIB | 93 | select ARCH_REQUIRE_GPIOLIB |
| 94 | select GENERIC_ALLOCATOR | 94 | select GENERIC_ALLOCATOR |
| 95 | select HAVE_FB_ATMEL | ||
| 95 | 96 | ||
| 96 | # | 97 | # |
| 97 | # CPU types | 98 | # CPU types |