[PATCH] Re: Git tree update, patches sent upstream

[PATCH] Re: Git tree update, patches sent upstream

[Dirk Behme]

[-- Attachment #1: Type: text/plain, Size: 776 bytes --]

Tony Lindgren wrote:
> * David Brownell <david-b@pacbell.net> [051111 09:10]:
> 
>>>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>





[-- Attachment #2: patch_platform_device.txt --]
[-- Type: text/plain, Size: 1331 bytes --]

--- ./sound/arm/omap-aic23.c_orig	2005-11-20 18:51:29.000000000 +0100
+++ ./sound/arm/omap-aic23.c	2005-11-20 19:03:50.682393232 +0100
@@ -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_orig	2005-11-20 18:35:31.000000000 +0100
+++ ./drivers/input/touchscreen/omap/omap_ts.c	2005-11-20 18:38:29.000000000 +0100
@@ -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>
 


[-- Attachment #3: Type: text/plain, Size: 184 bytes --]

_______________________________________________
Linux-omap-open-source mailing list
Linux-omap-open-source@linux.omap.com
http://linux.omap.com/mailman/listinfo/linux-omap-open-source

Re: [PATCH] Re: Git tree update, patches sent upstream

[Tony Lindgren]

* Dirk Behme <dirk.behme@de.bosch.com> [051120 10:13]:
> Tony Lindgren wrote:
> >* David Brownell <david-b@pacbell.net> [051111 09:10]:
> >
> >>>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

Thanks, pushing today.

Tony