Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 187189
b: refs/heads/master
c: 2164235
h: refs/heads/master
i:
  187187: c0c6f92
v: v3
  • Loading branch information
Christoph Egger authored and Linus Torvalds committed Mar 12, 2010
1 parent 2160088 commit 7ec886c
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 14 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2c0e0c88422033c9b6162bf7875aecdd095130b7
refs/heads/master: 2164235da9153f1fbd5191bf71c86fae322c7dd7
13 changes: 0 additions & 13 deletions trunk/drivers/video/mb862xx/mb862xxfb.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,6 @@
#define CARMINE_MEM_SIZE 0x8000000
#define DRV_NAME "mb862xxfb"

#if defined(CONFIG_LWMON5)
static struct mb862xx_gc_mode lwmon5_gc_mode = {
/* Mode for Sharp LQ104V1DG61 TFT LCD Panel */
{ "640x480", 60, 640, 480, 40000, 48, 16, 32, 11, 96, 2, 0, 0, 0 },
/* 16 bits/pixel, 32MB, 100MHz, SDRAM memory mode value */
16, 0x2000000, GC_CCF_COT_100, 0x414fb7f2
};
#endif

#if defined(CONFIG_SOCRATES)
static struct mb862xx_gc_mode socrates_gc_mode = {
/* Mode for Prime View PM070WL4 TFT LCD Panel */
Expand Down Expand Up @@ -600,10 +591,6 @@ static int __devinit of_platform_mb862xx_probe(struct of_device *ofdev,
goto irqdisp;
}

#if defined(CONFIG_LWMON5)
par->gc_mode = &lwmon5_gc_mode;
#endif

#if defined(CONFIG_SOCRATES)
par->gc_mode = &socrates_gc_mode;
#endif
Expand Down

0 comments on commit 7ec886c

Please sign in to comment.