diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-13 17:44:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-13 17:44:51 -0400 |
| commit | 97fb44eb6bc01f4ffed4300e475aa15e44877375 (patch) | |
| tree | 481ed6efd0babe7185cae04f2fd295426b36411d /drivers/video/Kconfig | |
| parent | e4707dd3e9d0cb57597b6568a5e51fea5d6fca41 (diff) | |
| parent | 148854c65ea8046b045672fd49f4333aefaa3ab5 (diff) | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel
Conflicts:
arch/arm/mach-at91/gpio.c
Diffstat (limited to 'drivers/video/Kconfig')
| -rw-r--r-- | drivers/video/Kconfig | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 5aa099bc7690..330204a61ea8 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig | |||
| @@ -397,7 +397,7 @@ config FB_SA1100 | |||
| 397 | 397 | ||
| 398 | config FB_IMX | 398 | config FB_IMX |
| 399 | tristate "Motorola i.MX LCD support" | 399 | tristate "Motorola i.MX LCD support" |
| 400 | depends on FB && ARM && ARCH_IMX | 400 | depends on FB && (ARCH_IMX || ARCH_MX2) |
| 401 | select FB_CFB_FILLRECT | 401 | select FB_CFB_FILLRECT |
| 402 | select FB_CFB_COPYAREA | 402 | select FB_CFB_COPYAREA |
| 403 | select FB_CFB_IMAGEBLIT | 403 | select FB_CFB_IMAGEBLIT |
| @@ -1054,9 +1054,7 @@ config FB_RIVA_BACKLIGHT | |||
| 1054 | 1054 | ||
| 1055 | config FB_I810 | 1055 | config FB_I810 |
| 1056 | tristate "Intel 810/815 support (EXPERIMENTAL)" | 1056 | tristate "Intel 810/815 support (EXPERIMENTAL)" |
| 1057 | depends on FB && EXPERIMENTAL && PCI && X86_32 | 1057 | depends on EXPERIMENTAL && FB && PCI && X86_32 && AGP_INTEL |
| 1058 | select AGP | ||
| 1059 | select AGP_INTEL | ||
| 1060 | select FB_MODE_HELPERS | 1058 | select FB_MODE_HELPERS |
| 1061 | select FB_CFB_FILLRECT | 1059 | select FB_CFB_FILLRECT |
| 1062 | select FB_CFB_COPYAREA | 1060 | select FB_CFB_COPYAREA |
| @@ -1119,9 +1117,7 @@ config FB_CARILLO_RANCH | |||
| 1119 | 1117 | ||
| 1120 | config FB_INTEL | 1118 | config FB_INTEL |
| 1121 | tristate "Intel 830M/845G/852GM/855GM/865G/915G/945G/945GM/965G/965GM support (EXPERIMENTAL)" | 1119 | tristate "Intel 830M/845G/852GM/855GM/865G/915G/945G/945GM/965G/965GM support (EXPERIMENTAL)" |
| 1122 | depends on FB && EXPERIMENTAL && PCI && X86 | 1120 | depends on EXPERIMENTAL && FB && PCI && X86 && AGP_INTEL |
| 1123 | select AGP | ||
| 1124 | select AGP_INTEL | ||
| 1125 | select FB_MODE_HELPERS | 1121 | select FB_MODE_HELPERS |
| 1126 | select FB_CFB_FILLRECT | 1122 | select FB_CFB_FILLRECT |
| 1127 | select FB_CFB_COPYAREA | 1123 | select FB_CFB_COPYAREA |