[PATCH 1/2] ARM: PNX4008: fix i2c-pnx.c build errors

[PATCH 1/2] ARM: PNX4008: fix i2c-pnx.c build errors

[Russell King - ARM Linux]

... caused by a missing include.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---
 drivers/i2c/busses/i2c-pnx.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/i2c/busses/i2c-pnx.c b/drivers/i2c/busses/i2c-pnx.c
index 6ff6c20..3ae5647 100644
--- a/drivers/i2c/busses/i2c-pnx.c
+++ b/drivers/i2c/busses/i2c-pnx.c
@@ -22,6 +22,7 @@
 #include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/uaccess.h>
+#include <mach/i2c.h>
 
 #define I2C_PNX_TIMEOUT		10 /* msec */
 #define I2C_PNX_SPEED_KHZ	100
-- 
1.6.2.5

[PATCH 2/2] ARM: PNX4008: fix watchdog device driver name

[Russell King - ARM Linux]

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---
 drivers/watchdog/pnx4008_wdt.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c
index f24d041..4d227b1 100644
--- a/drivers/watchdog/pnx4008_wdt.c
+++ b/drivers/watchdog/pnx4008_wdt.c
@@ -317,7 +317,7 @@ static int __devexit pnx4008_wdt_remove(struct platform_device *pdev)
 
 static struct platform_driver platform_wdt_driver = {
 	.driver = {
-		.name = "watchdog",
+		.name = "pnx4008-watchdog",
 		.owner	= THIS_MODULE,
 	},
 	.probe = pnx4008_wdt_probe,
@@ -352,4 +352,4 @@ MODULE_PARM_DESC(nowayout,
 
 MODULE_LICENSE("GPL");
 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
-MODULE_ALIAS("platform:watchdog");
+MODULE_ALIAS("platform:pnx4008-watchdog");
-- 
1.6.2.5

[PATCH 0/2] PNX fixes

[Russell King - ARM Linux]

The following patch series fixes compile bugs with current PNX drivers.
This is part of a larger patch set so I'd prefer to keep them in my
tree for merging with the next round of -rc fixes.

Only relevant patches will be cc'd to appropriate folk; the full series
will be posted on linux-arm-kernel.

Please provide acks for these two patches, thanks.

[PATCH 2/2] ARM: PNX4008: fix watchdog device driver name

[Wim Van Sebroeck]

Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
> ---
>  drivers/watchdog/pnx4008_wdt.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c
> index f24d041..4d227b1 100644
> --- a/drivers/watchdog/pnx4008_wdt.c
> +++ b/drivers/watchdog/pnx4008_wdt.c
> @@ -317,7 +317,7 @@ static int __devexit pnx4008_wdt_remove(struct platform_device *pdev)
>  
>  static struct platform_driver platform_wdt_driver = {
>  	.driver = {
> -		.name = "watchdog",
> +		.name = "pnx4008-watchdog",
>  		.owner	= THIS_MODULE,
>  	},
>  	.probe = pnx4008_wdt_probe,
> @@ -352,4 +352,4 @@ MODULE_PARM_DESC(nowayout,
>  
>  MODULE_LICENSE("GPL");
>  MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
> -MODULE_ALIAS("platform:watchdog");
> +MODULE_ALIAS("platform:pnx4008-watchdog");
> -- 
> 1.6.2.5
> 

[PATCH 2/2] ARM: PNX4008: fix watchdog device driver name

[Russell King - ARM Linux]

On Fri, Nov 20, 2009 at 03:09:12PM +0100, Wim Van Sebroeck wrote:
> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

Thanks, but I'll take that as an Acked-by instead, as per SubmittingPatches
section 13.

[PATCH 1/2] ARM: PNX4008: fix i2c-pnx.c build errors

[Ben Dooks]

On Fri, Nov 20, 2009 at 11:03:29AM +0000, Russell King - ARM Linux wrote:
> ... caused by a missing include.

hi, thought this was fixed by the last fix set I sent which went in post
2.6.32-rc8.
 
> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
> ---
>  drivers/i2c/busses/i2c-pnx.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/i2c/busses/i2c-pnx.c b/drivers/i2c/busses/i2c-pnx.c
> index 6ff6c20..3ae5647 100644
> --- a/drivers/i2c/busses/i2c-pnx.c
> +++ b/drivers/i2c/busses/i2c-pnx.c
> @@ -22,6 +22,7 @@
>  #include <mach/hardware.h>
>  #include <asm/irq.h>
>  #include <asm/uaccess.h>
> +#include <mach/i2c.h>
>  
>  #define I2C_PNX_TIMEOUT		10 /* msec */
>  #define I2C_PNX_SPEED_KHZ	100
> -- 
> 1.6.2.5
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

-- 
-- 
Ben

Q:      What's a light-year?
A:      One-third less calories than a regular year.

[PATCH 1/2] ARM: PNX4008: fix i2c-pnx.c build errors

[Russell King - ARM Linux]

On Fri, Nov 20, 2009 at 02:21:29PM +0000, Ben Dooks wrote:
> On Fri, Nov 20, 2009 at 11:03:29AM +0000, Russell King - ARM Linux wrote:
> > ... caused by a missing include.
> 
> hi, thought this was fixed by the last fix set I sent which went in post
> 2.6.32-rc8.

Ok, I'll rebase my master branch and drop this change.