From: Dirk Behme Date: Tue, 20 Sep 2005 07:40:45 +0000 (+0300) Subject: Remove warnings: X-Git-Tag: v2.6.15-omap2~207^2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d1140bbe6bf61e4634ed99999091eea929af6e1f;p=linux-2.6-omap-h63xx.git Remove warnings: arch/arm/plat-omap/dsp/dsp_core.c:760: warning: initialization from incompatible pointer type arch/arm/plat-omap/dsp/dsp_mem.c:1579: warning: initialization from incompatible pointer type Signed-off-by: Dirk Behme Signed-off-by: Tony Lindgren --- diff --git a/arch/arm/plat-omap/dsp/dsp_core.c b/arch/arm/plat-omap/dsp/dsp_core.c index c0a06492f40..b0f62b84ad7 100644 --- a/arch/arm/plat-omap/dsp/dsp_core.c +++ b/arch/arm/plat-omap/dsp/dsp_core.c @@ -696,7 +696,7 @@ static int dsp_drv_remove(struct device *dev) } #ifdef CONFIG_PM -static int dsp_drv_suspend(struct device *dev, u32 state, u32 level) +static int dsp_drv_suspend(struct device *dev, pm_message_t state, u32 level) { switch(level) { case SUSPEND_NOTIFY: diff --git a/arch/arm/plat-omap/dsp/dsp_mem.c b/arch/arm/plat-omap/dsp/dsp_mem.c index afae8ac6072..7ad0c05491f 100644 --- a/arch/arm/plat-omap/dsp/dsp_mem.c +++ b/arch/arm/plat-omap/dsp/dsp_mem.c @@ -1565,7 +1565,8 @@ static ssize_t exmap_show(struct device *dev, struct device_attribute *attr, static struct device_attribute dev_attr_exmap = __ATTR_RO(exmap); -static ssize_t kmem_pool_show(struct device *dev, char *buf) +static ssize_t kmem_pool_show(struct device *dev, + struct device_attribute *attr, char *buf) { int count_1M, count_64K, total;