diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-11-21 18:42:06 -0500 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-11-21 18:42:06 -0500 |
| commit | 300e812db26f4aa022e346f5fb9af1af134d98d8 (patch) | |
| tree | 382b45253a704087e8aa0c770bf3fc2ad67d4b02 /drivers/video/Kconfig | |
| parent | 4420dd2b306f1997232a13462bca0d420be5b1b8 (diff) | |
| parent | cfcfc9eca2bcbd26a8e206baeb005b055dbf8e37 (diff) | |
Merge commit 'v3.2-rc2' into fbdev-next
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 1b5b98f29482..dcf0a828f66e 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig | |||
| @@ -1753,7 +1753,7 @@ endchoice | |||
| 1753 | 1753 | ||
| 1754 | config FB_AU1100 | 1754 | config FB_AU1100 |
| 1755 | bool "Au1100 LCD Driver" | 1755 | bool "Au1100 LCD Driver" |
| 1756 | depends on (FB = y) && MIPS && SOC_AU1100 | 1756 | depends on (FB = y) && MIPS_ALCHEMY |
| 1757 | select FB_CFB_FILLRECT | 1757 | select FB_CFB_FILLRECT |
| 1758 | select FB_CFB_COPYAREA | 1758 | select FB_CFB_COPYAREA |
| 1759 | select FB_CFB_IMAGEBLIT | 1759 | select FB_CFB_IMAGEBLIT |
| @@ -1764,7 +1764,7 @@ config FB_AU1100 | |||
| 1764 | 1764 | ||
| 1765 | config FB_AU1200 | 1765 | config FB_AU1200 |
| 1766 | bool "Au1200 LCD Driver" | 1766 | bool "Au1200 LCD Driver" |
| 1767 | depends on (FB = y) && MIPS && SOC_AU1200 | 1767 | depends on (FB = y) && MIPS_ALCHEMY |
| 1768 | select FB_SYS_FILLRECT | 1768 | select FB_SYS_FILLRECT |
| 1769 | select FB_SYS_COPYAREA | 1769 | select FB_SYS_COPYAREA |
| 1770 | select FB_SYS_IMAGEBLIT | 1770 | select FB_SYS_IMAGEBLIT |