diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-02 18:38:22 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-02 18:38:22 -0800 |
| commit | cfa024f4e45562c50b9eccb23649ab103578037b (patch) | |
| tree | d49992521230a4e302c6d4bef9191e885220b82e /drivers | |
| parent | 3a7142371efdc95f4c5b5ffc188b18efdc4e64dd (diff) | |
| parent | a054a811597a17ffbe92bc4db04a4dc2f1b1ea55 (diff) | |
| download | linux-0-day-cfa024f4e45562c50b9eccb23649ab103578037b.tar.gz linux-0-day-cfa024f4e45562c50b9eccb23649ab103578037b.tar.xz | |
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 cde6fd8eb390a..4fc93dc2b4d3e 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) static struct amba_id clcdfb_id_table[] = { { .id = 0x00041110, - .mask = 0x000fffff, + .mask = 0x000ffffe, }, { 0, 0 }, }; static struct amba_driver clcd_driver = { .drv = { - .name = "clcd-pl110", + .name = "clcd-pl11x", }, .probe = clcdfb_probe, .remove = clcdfb_remove, |