diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-02 21:38:22 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-02 21:38:22 -0500 |
| commit | cfa024f4e45562c50b9eccb23649ab103578037b (patch) | |
| tree | d49992521230a4e302c6d4bef9191e885220b82e /drivers | |
| parent | 3a7142371efdc95f4c5b5ffc188b18efdc4e64dd (diff) | |
| parent | a054a811597a17ffbe92bc4db04a4dc2f1b1ea55 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/amba-clcd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/amba-clcd.c b/drivers/video/amba-clcd.c index cde6fd8eb390..4fc93dc2b4d3 100644 --- a/drivers/video/amba-clcd.c +++ b/drivers/video/amba-clcd.c | |||
| @@ -505,14 +505,14 @@ static int clcdfb_remove(struct amba_device *dev) | |||
| 505 | static struct amba_id clcdfb_id_table[] = { | 505 | static struct amba_id clcdfb_id_table[] = { |
| 506 | { | 506 | { |
| 507 | .id = 0x00041110, | 507 | .id = 0x00041110, |
| 508 | .mask = 0x000fffff, | 508 | .mask = 0x000ffffe, |
| 509 | }, | 509 | }, |
| 510 | { 0, 0 }, | 510 | { 0, 0 }, |
| 511 | }; | 511 | }; |
| 512 | 512 | ||
| 513 | static struct amba_driver clcd_driver = { | 513 | static struct amba_driver clcd_driver = { |
| 514 | .drv = { | 514 | .drv = { |
| 515 | .name = "clcd-pl110", | 515 | .name = "clcd-pl11x", |
| 516 | }, | 516 | }, |
| 517 | .probe = clcdfb_probe, | 517 | .probe = clcdfb_probe, |
| 518 | .remove = clcdfb_remove, | 518 | .remove = clcdfb_remove, |