diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-10 06:43:33 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-10 06:43:33 +0300 |
| commit | 4ef58d4e2ad1fa2a3e5bbf41af2284671fca8cf8 (patch) | |
| tree | 856ba96302a36014736747e8464f80eeb827bbdd /drivers/video/omap | |
| parent | f6c4c8195b5e7878823caa1181be404d9e86d369 (diff) | |
| parent | d014d043869cdc591f3a33243d3481fa4479c2d0 (diff) | |
| download | linux-4ef58d4e2ad1fa2a3e5bbf41af2284671fca8cf8.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (42 commits)
tree-wide: fix misspelling of "definition" in comments
reiserfs: fix misspelling of "journaled"
doc: Fix a typo in slub.txt.
inotify: remove superfluous return code check
hdlc: spelling fix in find_pvc() comment
doc: fix regulator docs cut-and-pasteism
mtd: Fix comment in Kconfig
doc: Fix IRQ chip docs
tree-wide: fix assorted typos all over the place
drivers/ata/libata-sff.c: comment spelling fixes
fix typos/grammos in Documentation/edac.txt
sysctl: add missing comments
fs/debugfs/inode.c: fix comment typos
sgivwfb: Make use of ARRAY_SIZE.
sky2: fix sky2_link_down copy/paste comment error
tree-wide: fix typos "couter" -> "counter"
tree-wide: fix typos "offest" -> "offset"
fix kerneldoc for set_irq_msi()
spidev: fix double "of of" in comment
comment typo fix: sybsystem -> subsystem
...
Diffstat (limited to 'drivers/video/omap')
| -rw-r--r-- | drivers/video/omap/lcd_ams_delta.c | 4 | ||||
| -rw-r--r-- | drivers/video/omap/lcd_mipid.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/omap/lcd_ams_delta.c b/drivers/video/omap/lcd_ams_delta.c index 3d5277252ca3..b3973ebd1b0f 100644 --- a/drivers/video/omap/lcd_ams_delta.c +++ b/drivers/video/omap/lcd_ams_delta.c @@ -123,12 +123,12 @@ struct platform_driver ams_delta_panel_driver = { }, }; -static int ams_delta_panel_drv_init(void) +static int __init ams_delta_panel_drv_init(void) { return platform_driver_register(&ams_delta_panel_driver); } -static void ams_delta_panel_drv_cleanup(void) +static void __exit ams_delta_panel_drv_cleanup(void) { platform_driver_unregister(&ams_delta_panel_driver); } diff --git a/drivers/video/omap/lcd_mipid.c b/drivers/video/omap/lcd_mipid.c index 2162eb09e0fe..8f3e2b4bb4f3 100644 --- a/drivers/video/omap/lcd_mipid.c +++ b/drivers/video/omap/lcd_mipid.c @@ -607,7 +607,7 @@ static struct spi_driver mipid_spi_driver = { .remove = __devexit_p(mipid_spi_remove), }; -static int mipid_drv_init(void) +static int __init mipid_drv_init(void) { spi_register_driver(&mipid_spi_driver); @@ -615,7 +615,7 @@ static int mipid_drv_init(void) } module_init(mipid_drv_init); -static void mipid_drv_cleanup(void) +static void __exit mipid_drv_cleanup(void) { spi_unregister_driver(&mipid_spi_driver); } |