Git tree update, patches sent upstream

PATCH Dirk Behme 2 participants 2 messages Nov 20, 2005 – Nov 21, 2005 3 messages not in the archive

Subsystems (2)

Sound Input drivers

lore

Share & tools

lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Dirk Behme

author

2005-11-20 18:13 UTC #3 lore raw

Quoted 9 lines · Tony Lindgren

Quoted 3 lines · David Brownell
Quoted 1 line
error: `platform_bus_type' undeclared here (not in a function)
#include <linux/platform_device.h> is now needed.
It's best just replace <linux/device.h> with <linux/platform_device.h>, as it already includes <linux/device.h>.

Remove error

drivers/video/omap/omapfb_main.c:1395: error: platform_bus_type' undeclared here (not in a function) sound/arm/omap-aic23.c:879: 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>

sound/arm/omap-aic23.c renamed from sound/arm/omap-aic23.c_orig +3 -3

@@ -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_car
 /*
  * 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 dev
 	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);

drivers/input/touchscreen/omap/omap_ts.c renamed from drivers/input/touchscreen/omap/omap_ts.c_orig +1 -1

@@ -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>

_______________________________________________
Linux-omap-open-source mailing list
[email protected]
http://linux.omap.com/mailman/listinfo/linux-omap-open-source

Tony Lindgren

2005-11-21 17:09 UTC #4 lore raw

Quoted 18 lines · Dirk Behme

Quoted 9 lines · Tony Lindgren
Quoted 3 lines · David Brownell
Quoted 1 line
error: `platform_bus_type' undeclared here (not in a function)
#include <linux/platform_device.h> is now needed.
It's best just replace <linux/device.h> with <linux/platform_device.h>, as it already includes <linux/device.h>.
Remove error
drivers/video/omap/omapfb_main.c:1395: error: platform_bus_type' undeclared here (not in a function) sound/arm/omap-aic23.c:879: error: platform_bus_type' undeclared here (not in a function)

Quoted 6 lines

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

Thanks, pushing today.

Tony