diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-03 06:52:33 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-03 06:52:33 -0400 |
| commit | 56f68556d7bbb51dd158c74deb09c783345bfbbd (patch) | |
| tree | 536e6e3c7063b1eee927194dda257602bd3dc66f /drivers/video/omap/lcdc.h | |
| parent | fd9470ce3ac6fb54d6026e4b1cdab0936e34805e (diff) | |
| parent | 7c8ad9828e793573877fd60868bb5d2f1e3b64da (diff) | |
Merge unstable branch 'omap-rmk'
Merge branch 'omap-rmk' into omap-all
Diffstat (limited to 'drivers/video/omap/lcdc.h')
| -rw-r--r-- | drivers/video/omap/lcdc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/omap/lcdc.h b/drivers/video/omap/lcdc.h index adb731e5314a..845222270db3 100644 --- a/drivers/video/omap/lcdc.h +++ b/drivers/video/omap/lcdc.h | |||
| @@ -4,4 +4,6 @@ | |||
| 4 | int omap_lcdc_set_dma_callback(void (*callback)(void *data), void *data); | 4 | int omap_lcdc_set_dma_callback(void (*callback)(void *data), void *data); |
| 5 | void omap_lcdc_free_dma_callback(void); | 5 | void omap_lcdc_free_dma_callback(void); |
| 6 | 6 | ||
| 7 | extern const struct lcd_ctrl omap1_int_ctrl; | ||
| 8 | |||
| 7 | #endif | 9 | #endif |