ARM: OMAP: Remove error

drivers/video/omap/omapfb_main.c:1395: error: platform_bus_type' undeclared here
(not in a function)

Remove warning

sound/arm/omap-aic23.c:882: warning: initialization from incompatible
pointer type
sound/arm/omap-aic23.c:883: warning: initialization from incompatible
pointer type

Signed-off-by: Dirk Behme <dirk.behme_at_de.bosch.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/drivers/input/touchscreen/omap/omap_ts.c b/drivers/input/touchscreen/omap/omap_ts.c
index 269ffc75ef0262b1a4888d473beed40c9fad17f6..a7fa016cb539e7d0fdbe1b89e4251a4de8343d5a 100644 (file)
--- a/drivers/input/touchscreen/omap/omap_ts.c
+++ b/drivers/input/touchscreen/omap/omap_ts.c
@@ -35,7 +35,7 @@
 #include <linux/wait.h>
 #include <linux/interrupt.h>
 #include <linux/suspend.h>
-#include <linux/device.h>
+#include <linux/platform_device.h>
 
 #include <asm/mach-types.h>
 

diff --git a/sound/arm/omap-aic23.c b/sound/arm/omap-aic23.c
index 9c651cf36de3b989a7fd43220cae91310c3df2b6..960108f546ec7f66389d2d527a46c9526166c556 100644 (file)
--- a/sound/arm/omap-aic23.c
+++ b/sound/arm/omap-aic23.c
@@ -39,7 +39,7 @@
 #include <linux/config.h>
 #include <sound/driver.h>
 #include <linux/module.h>
-#include <linux/device.h>
+#include <linux/platform_device.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
 #include <linux/errno.h>
@@ -668,7 +668,7 @@ static int snd_omap_aic23_resume(snd_card_t * card)
 /*
  * Driver suspend/resume - calls alsa functions. Some hints from aaci.c
  */
-static int omap_aic23_suspend(struct device *dev, pm_message_t state, u32 level)
+static int omap_aic23_suspend(struct device *dev, pm_message_t state)
 {
        snd_card_t *card = dev_get_drvdata(dev);
        
@@ -678,7 +678,7 @@ static int omap_aic23_suspend(struct device *dev, pm_message_t state, u32 level)
        return 0;
 }
 
-static int omap_aic23_resume(struct device *dev, u32 level)
+static int omap_aic23_resume(struct device *dev)
 {
        snd_card_t *card = dev_get_drvdata(dev);