diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-08 15:15:31 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-08 15:15:31 -0800 |
| commit | 9f04012c58a32756bbbd0239c4144e835048aa4d (patch) | |
| tree | e5423a1941338b9dd17a82b370cc6c252e0ae1f1 /drivers/video | |
| parent | 329f7dba5f7dc3bc9a30ad00cf373d2e83115aa1 (diff) | |
| parent | 72274c9e24d58d09489d37e732545e52395da270 (diff) | |
| download | blackbird-obmc-linux-9f04012c58a32756bbbd0239c4144e835048aa4d.tar.gz blackbird-obmc-linux-9f04012c58a32756bbbd0239c4144e835048aa4d.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/amba-clcd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/amba-clcd.c b/drivers/video/amba-clcd.c index 467a1d7ebbde..a3c2c45e29e0 100644 --- a/drivers/video/amba-clcd.c +++ b/drivers/video/amba-clcd.c @@ -518,7 +518,7 @@ static struct amba_driver clcd_driver = { .id_table = clcdfb_id_table, }; -int __init amba_clcdfb_init(void) +static int __init amba_clcdfb_init(void) { if (fb_get_options("ambafb", NULL)) return -ENODEV; |
