Skip to contentSkip to conversation

PNX fixes

PATCH New Russell King - ARM Linux 3 participants 7 messages Nov 20, 2009

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover PNX fixes

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.

#1 lore raw

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

... caused by a missing include.

---
 drivers/i2c/busses/i2c-pnx.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/i2c/busses/i2c-pnx.c +1 -0
index 6ff6c20..3ae5647 100644
@@ -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
Signature · 1 line
1.6.2.5
#2 lore raw

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

Quoted 1 line · Russell King - ARM Linux

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

Quoted 25 lines
---
 drivers/i2c/busses/i2c-pnx.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/i2c/busses/i2c-pnx.c +1 -0
index 6ff6c20..3ae5647 100644
@@ -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
Signature · 7 lines
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
Signature · 5 lines
-- 
Ben

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

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

Quoted 5 lines · Ben Dooks
Quoted 1 line · Russell King - ARM Linux

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

#4 lore raw

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

In reply to Russell King - ARM Linux
---
 drivers/watchdog/pnx4008_wdt.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/watchdog/pnx4008_wdt.c +2 -2
index f24d041..4d227b1 100644
@@ -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");
Signature · 1 line
1.6.2.5
#5 lore raw

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

Quoted 27 lines
---
 drivers/watchdog/pnx4008_wdt.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/watchdog/pnx4008_wdt.c +2 -2
index f24d041..4d227b1 100644
@@ -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");
Signature · 1 line
1.6.2.5