diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-12 16:15:17 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-12 16:15:17 -0400 |
| commit | 02a99ed6207e9a1d787bb360ef97de023c7edf4a (patch) | |
| tree | f5818df7dd3f3741d02afbdd4271deed48c41f3d /drivers/video | |
| parent | 2b10dc45d15150434d7f206264e912eacbff734b (diff) | |
| parent | 3447ef29a7f3b1fd0d8d58376950e695e04f6f8b (diff) | |
Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze
* 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze: (55 commits)
microblaze: Don't use access_ok for unaligned
microblaze: remove unused flat_stack_align() definition
microblaze: Fix problem with early_printk in startup
microblaze_mmu_v2: Makefiles
microblaze_mmu_v2: Kconfig update
microblaze_mmu_v2: stat.h MMU update
microblaze_mmu_v2: Elf update
microblaze_mmu_v2: Update dma.h for MMU
microblaze_mmu_v2: Update cacheflush.h
microblaze_mmu_v2: Update signal returning address
microblaze_mmu_v2: Traps MMU update
microblaze_mmu_v2: Enable fork syscall for MMU and add fork as vfork for noMMU
microblaze_mmu_v2: Update linker script for MMU
microblaze_mmu_v2: Add MMU related exceptions handling
microblaze_mmu_v2: uaccess MMU update
microblaze_mmu_v2: Update exception handling - MMU exception
microblaze_mmu_v2: entry.S, entry.h
microblaze_mmu_v2: Add CURRENT_TASK for entry.S
microblaze_mmu_v2: MMU asm offset update
microblaze_mmu_v2: Update tlb.h and tlbflush.h
...
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 0048f1185a60..74712cb8399a 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig | |||
| @@ -1996,7 +1996,7 @@ config FB_PS3_DEFAULT_SIZE_M | |||
| 1996 | 1996 | ||
| 1997 | config FB_XILINX | 1997 | config FB_XILINX |
| 1998 | tristate "Xilinx frame buffer support" | 1998 | tristate "Xilinx frame buffer support" |
| 1999 | depends on FB && XILINX_VIRTEX | 1999 | depends on FB && (XILINX_VIRTEX || MICROBLAZE) |
| 2000 | select FB_CFB_FILLRECT | 2000 | select FB_CFB_FILLRECT |
| 2001 | select FB_CFB_COPYAREA | 2001 | select FB_CFB_COPYAREA |
| 2002 | select FB_CFB_IMAGEBLIT | 2002 | select FB_CFB_IMAGEBLIT |