diff --git a/[refs] b/[refs]
index 0aa5bdcca12b..d0d28bb064b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3fef7f10010e7946b3db1a34d8e0208e4f10001
+refs/heads/master: 22976a5dada65a0f44918e91c5f1fb5041dc1d5e
diff --git a/trunk/drivers/pwm/pwm-pxa.c b/trunk/drivers/pwm/pwm-pxa.c
index b78988255aee..dee6ab552a0a 100644
--- a/trunk/drivers/pwm/pwm-pxa.c
+++ b/trunk/drivers/pwm/pwm-pxa.c
@@ -23,14 +23,13 @@
 #include <asm/div64.h>
 
 #define HAS_SECONDARY_PWM	0x10
-#define PWM_ID_BASE(d)		((d) & 0xf)
 
 static const struct platform_device_id pwm_id_table[] = {
 	/*   PWM    has_secondary_pwm? */
 	{ "pxa25x-pwm", 0 },
-	{ "pxa27x-pwm", 0 | HAS_SECONDARY_PWM },
-	{ "pxa168-pwm", 1 },
-	{ "pxa910-pwm", 1 },
+	{ "pxa27x-pwm", HAS_SECONDARY_PWM },
+	{ "pxa168-pwm", 0 },
+	{ "pxa910-pwm", 0 },
 	{ },
 };
 MODULE_DEVICE_TABLE(platform, pwm_id_table);