Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 54973
b: refs/heads/master
c: 147394c
h: refs/heads/master
i:
  54971: 84b6e6b
v: v3
  • Loading branch information
Andrei Konovalov authored and Linus Torvalds committed May 8, 2007
1 parent 708a2ab commit f40083e
Show file tree
Hide file tree
Showing 5 changed files with 401 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 435d56fcd45cdf32bfb4db5d4e1efe17f3da95b2
refs/heads/master: 147394c8ece44be85d692cc92cc0d047e4d8fb69
7 changes: 7 additions & 0 deletions trunk/arch/ppc/syslib/virtex_devices.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@

#include <linux/platform_device.h>

/* ML300/403 reference design framebuffer driver platform data struct */
struct xilinxfb_platform_data {
u32 rotate_screen;
u32 screen_height_mm;
u32 screen_width_mm;
};

void __init virtex_early_serial_map(void);

/* Prototype for device fixup routine. Implement this routine in the
Expand Down
11 changes: 11 additions & 0 deletions trunk/drivers/video/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -1755,6 +1755,17 @@ config FB_PS3_DEFAULT_SIZE_M
The default value can be overridden on the kernel command line
using the "ps3fb" option (e.g. "ps3fb=9M");

config FB_XILINX
tristate "Xilinx frame buffer support"
depends on FB && XILINX_VIRTEX
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
---help---
Include support for the Xilinx ML300/ML403 reference design
framebuffer. ML300 carries a 640*480 LCD display on the board,
ML403 uses a standard DB15 VGA connector.

config FB_VIRTUAL
tristate "Virtual Frame Buffer support (ONLY FOR TESTING!)"
depends on FB
Expand Down
1 change: 1 addition & 0 deletions trunk/drivers/video/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ obj-$(CONFIG_FB_PNX4008_DUM_RGB) += pnx4008/
obj-$(CONFIG_FB_IBM_GXT4500) += gxt4500.o
obj-$(CONFIG_FB_PS3) += ps3fb.o
obj-$(CONFIG_FB_SM501) += sm501fb.o
obj-$(CONFIG_FB_XILINX) += xilinxfb.o

# Platform or fallback drivers go here
obj-$(CONFIG_FB_VESA) += vesafb.o
Expand Down
Loading

0 comments on commit f40083e

Please sign in to comment.