diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-14 00:29:49 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-14 00:29:49 -0400 |
| commit | 11c2d8174ed3dc4f1971564732689b4a39129702 (patch) | |
| tree | ac00daa548ea8ac24ae7a5c8062312e335ab9858 /drivers/video/Kconfig | |
| parent | cde274c0c789404df8ece3f9e7d6506caf0127e2 (diff) | |
| parent | bce7f793daec3e65ec5c5705d2457b81fe7b5725 (diff) | |
Merge commit 'origin/HEAD' into test-merge
Manual fixup of include/asm-powerpc/pgtable-ppc64.h
Diffstat (limited to 'drivers/video/Kconfig')
| -rw-r--r-- | drivers/video/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 002b61b4f0f6..e0c5f96b273d 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig | |||
| @@ -1825,12 +1825,13 @@ config FB_FSL_DIU | |||
| 1825 | 1825 | ||
| 1826 | config FB_W100 | 1826 | config FB_W100 |
| 1827 | tristate "W100 frame buffer support" | 1827 | tristate "W100 frame buffer support" |
| 1828 | depends on FB && PXA_SHARPSL | 1828 | depends on FB && ARCH_PXA |
| 1829 | select FB_CFB_FILLRECT | 1829 | select FB_CFB_FILLRECT |
| 1830 | select FB_CFB_COPYAREA | 1830 | select FB_CFB_COPYAREA |
| 1831 | select FB_CFB_IMAGEBLIT | 1831 | select FB_CFB_IMAGEBLIT |
| 1832 | ---help--- | 1832 | ---help--- |
| 1833 | Frame buffer driver for the w100 as found on the Sharp SL-Cxx series. | 1833 | Frame buffer driver for the w100 as found on the Sharp SL-Cxx series. |
| 1834 | It can also drive the w3220 chip found on iPAQ hx4700. | ||
| 1834 | 1835 | ||
| 1835 | This driver is also available as a module ( = code which can be | 1836 | This driver is also available as a module ( = code which can be |
| 1836 | inserted and removed from the running kernel whenever you want). The | 1837 | inserted and removed from the running kernel whenever you want). The |