Merge branch 'uhid' into for-linus

[~andy/linux] / arch / arm / mach-omap1 / lcd_dma.c

diff --git a/arch/arm/mach-omap1/lcd_dma.c b/arch/arm/mach-omap1/lcd_dma.c
index 86ace9aaa6631374dc527ed758e600d251f328e8..5769c71815b2e3a6b8324ab17764824791723de5 100644 (file)
--- a/arch/arm/mach-omap1/lcd_dma.c
+++ b/arch/arm/mach-omap1/lcd_dma.c
@@ -57,7 +57,7 @@ static struct lcd_dma_info {
        void *cb_data;
 
        int active;
-       unsigned long addr, size;
+       unsigned long addr;
        int rotate, data_type, xres, yres;
        int vxres;
        int mirror;
@@ -77,11 +77,6 @@ void omap_set_lcd_dma_b1(unsigned long addr, u16 fb_xres, u16 fb_yres,
 }
 EXPORT_SYMBOL(omap_set_lcd_dma_b1);
 
-void omap_set_lcd_dma_src_port(int port)
-{
-       lcd_dma.src_port = port;
-}
-
 void omap_set_lcd_dma_ext_controller(int external)
 {
        lcd_dma.ext_ctrl = external;