diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-03 16:28:14 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-03 16:28:14 -0400 |
| commit | d6748066ad0e8b2514545998f8367ebb3906f299 (patch) | |
| tree | f7a9bfd764a8fb781aeda0ef2249afbab42dddf7 /drivers/video | |
| parent | f04c045f8ce69c22bda9d99eb927276b776135fc (diff) | |
| parent | 3ba1e543ab4b02640d396098f2f6a199560d5f2d (diff) | |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (37 commits)
MIPS: O32: Provide definition of registers ta0 .. ta3.
MIPS: perf: Add Octeon support for hardware perf.
MIPS: perf: Add support for 64-bit perf counters.
MIPS: perf: Reorganize contents of perf support files.
MIPS: perf: Cleanup formatting in arch/mips/kernel/perf_event.c
MIPS: Add accessor macros for 64-bit performance counter registers.
MIPS: Add probes for more Octeon II CPUs.
MIPS: Add more CPU identifiers for Octeon II CPUs.
MIPS: XLR, XLS: Add comment for smp setup
MIPS: JZ4740: GPIO: Check correct IRQ in demux handler
MIPS: JZ4740: GPIO: Simplify IRQ demuxer
MIPS: JZ4740: Use generic irq chip
MIPS: Alchemy: remove all CONFIG_SOC_AU1??? defines
MIPS: Alchemy: kill au1xxx.h header
MIPS: Alchemy: clean DMA code of CONFIG_SOC_AU1??? defines
MIPS, IDE: Alchem, au1xxx-ide: Remove pb1200/db1200 header dep
MIPS: Alchemy: Redo PCI as platform driver
MIPS: Alchemy: more base address cleanup
MIPS: Alchemy: rewrite USB platform setup.
MIPS: Alchemy: abstract USB block control register access
...
Fix up trivial conflicts in:
arch/mips/alchemy/devboards/db1x00/platform.c
drivers/ide/Kconfig
drivers/mmc/host/au1xmmc.c
drivers/video/Kconfig
sound/mips/Kconfig
Diffstat (limited to 'drivers/video')
| -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 8165c5577d7..d83e967e4e1 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 |