diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-09-16 00:48:32 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-09-16 00:48:32 -0400 |
| commit | ea88023b3491a384575ebcd5e8a449e841a28a24 (patch) | |
| tree | f46e3d8302e44dc55ce31823501e100472d29683 /drivers/video/Kconfig | |
| parent | a6f15ade97989d414e9bf33874c9d5d1f39808ec (diff) | |
| parent | 0cb583fd2862f19ea88b02eb307d11c09e51e2f8 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/sh/kernel/vmlinux.lds.S
Diffstat (limited to 'drivers/video/Kconfig')
| -rw-r--r-- | drivers/video/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 7e2c9774f08f..49f2c4bdf904 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig | |||
| @@ -935,7 +935,7 @@ config FB_S1D13XXX | |||
| 935 | 935 | ||
| 936 | config FB_ATMEL | 936 | config FB_ATMEL |
| 937 | tristate "AT91/AT32 LCD Controller support" | 937 | tristate "AT91/AT32 LCD Controller support" |
| 938 | depends on FB && (ARCH_AT91SAM9261 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91CAP9 || AVR32) | 938 | depends on FB && (ARCH_AT91SAM9261 || ARCH_AT91SAM9G10 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91SAM9G45 || ARCH_AT91CAP9 || AVR32) |
| 939 | select FB_CFB_FILLRECT | 939 | select FB_CFB_FILLRECT |
| 940 | select FB_CFB_COPYAREA | 940 | select FB_CFB_COPYAREA |
| 941 | select FB_CFB_IMAGEBLIT | 941 | select FB_CFB_IMAGEBLIT |
| @@ -951,7 +951,7 @@ config FB_INTSRAM | |||
| 951 | 951 | ||
| 952 | config FB_ATMEL_STN | 952 | config FB_ATMEL_STN |
| 953 | bool "Use a STN display with AT91/AT32 LCD Controller" | 953 | bool "Use a STN display with AT91/AT32 LCD Controller" |
| 954 | depends on FB_ATMEL && MACH_AT91SAM9261EK | 954 | depends on FB_ATMEL && (MACH_AT91SAM9261EK || MACH_AT91SAM9G10EK) |
| 955 | default n | 955 | default n |
| 956 | help | 956 | help |
| 957 | Say Y if you want to connect a STN LCD display to the AT91/AT32 LCD | 957 | Say Y if you want to connect a STN LCD display to the AT91/AT32 LCD |