Merge branch 'for-next' into for-linus

Conflicts: kernel/irq/chip.c
author: Jiri Kosina <jkosina@suse.cz> 2009-12-07 12:36:35 -0500
committer: Jiri Kosina <jkosina@suse.cz> 2009-12-07 12:36:35 -0500
commit: d014d043869cdc591f3a33243d3481fa4479c2d0 (patch)
tree: 63626829498e647ba058a1ce06419fe7e4d5f97d /arch/arm/mach-pxa/include/mach
parent: 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff)
parent: 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff)
6 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-pxa/include/mach/palmld.h b/arch/arm/mach-pxa/include/mach/palmld.h
index 8721b8010221..ae536e86d8e8 100644
--- a/arch/arm/mach-pxa/include/mach/palmld.h
+++ b/arch/arm/mach-pxa/include/mach/palmld.h
@@ -91,7 +91,7 @@
 /* BATTERY */
 #define PALMLD_BAT_MAX_VOLTAGE          4000    /* 4.00V maximum voltage */
 #define PALMLD_BAT_MIN_VOLTAGE          3550    /* 3.55V critical voltage */
-#define PALMLD_BAT_MAX_CURRENT          0       /* unknokn */
+#define PALMLD_BAT_MAX_CURRENT          0       /* unknown */
 #define PALMLD_BAT_MIN_CURRENT          0       /* unknown */
 #define PALMLD_BAT_MAX_CHARGE           1       /* unknown */
 #define PALMLD_BAT_MIN_CHARGE           1       /* unknown */
diff --git a/arch/arm/mach-pxa/include/mach/palmt5.h b/arch/arm/mach-pxa/include/mach/palmt5.h
index d15662aba008..6baf7469d4ec 100644
--- a/arch/arm/mach-pxa/include/mach/palmt5.h
+++ b/arch/arm/mach-pxa/include/mach/palmt5.h
@@ -66,7 +66,7 @@
 /* BATTERY */
 #define PALMT5_BAT_MAX_VOLTAGE          4000    /* 4.00v current voltage */
 #define PALMT5_BAT_MIN_VOLTAGE          3550    /* 3.55v critical voltage */
-#define PALMT5_BAT_MAX_CURRENT          0       /* unknokn */
+#define PALMT5_BAT_MAX_CURRENT          0       /* unknown */
 #define PALMT5_BAT_MIN_CURRENT          0       /* unknown */
 #define PALMT5_BAT_MAX_CHARGE           1       /* unknown */
 #define PALMT5_BAT_MIN_CHARGE           1       /* unknown */
diff --git a/arch/arm/mach-pxa/include/mach/palmtc.h b/arch/arm/mach-pxa/include/mach/palmtc.h
index 3dc9b074ab46..3f9dd3fd4638 100644
--- a/arch/arm/mach-pxa/include/mach/palmtc.h
+++ b/arch/arm/mach-pxa/include/mach/palmtc.h
@@ -68,7 +68,7 @@
 /* BATTERY */
 #define PALMTC_BAT_MAX_VOLTAGE          4000    /* 4.00V maximum voltage */
 #define PALMTC_BAT_MIN_VOLTAGE          3550    /* 3.55V critical voltage */
-#define PALMTC_BAT_MAX_CURRENT          0       /* unknokn */
+#define PALMTC_BAT_MAX_CURRENT          0       /* unknown */
 #define PALMTC_BAT_MIN_CURRENT          0       /* unknown */
 #define PALMTC_BAT_MAX_CHARGE           1       /* unknown */
 #define PALMTC_BAT_MIN_CHARGE           1       /* unknown */
diff --git a/arch/arm/mach-pxa/include/mach/palmte2.h b/arch/arm/mach-pxa/include/mach/palmte2.h
index 12361341f9d8..f89e989a7637 100644
--- a/arch/arm/mach-pxa/include/mach/palmte2.h
+++ b/arch/arm/mach-pxa/include/mach/palmte2.h
@@ -59,7 +59,7 @@
 /* BATTERY */
 #define PALMTE2_BAT_MAX_VOLTAGE         4000    /* 4.00v current voltage */
 #define PALMTE2_BAT_MIN_VOLTAGE         3550    /* 3.55v critical voltage */
-#define PALMTE2_BAT_MAX_CURRENT         0       /* unknokn */
+#define PALMTE2_BAT_MAX_CURRENT         0       /* unknown */
 #define PALMTE2_BAT_MIN_CURRENT         0       /* unknown */
 #define PALMTE2_BAT_MAX_CHARGE          1       /* unknown */
 #define PALMTE2_BAT_MIN_CHARGE          1       /* unknown */
diff --git a/arch/arm/mach-pxa/include/mach/palmtx.h b/arch/arm/mach-pxa/include/mach/palmtx.h
index 1be0db6ed55e..10abc4f2e8e4 100644
--- a/arch/arm/mach-pxa/include/mach/palmtx.h
+++ b/arch/arm/mach-pxa/include/mach/palmtx.h
@@ -94,7 +94,7 @@
 /* BATTERY */
 #define PALMTX_BAT_MAX_VOLTAGE          4000    /* 4.00v current voltage */
 #define PALMTX_BAT_MIN_VOLTAGE          3550    /* 3.55v critical voltage */
-#define PALMTX_BAT_MAX_CURRENT          0       /* unknokn */
+#define PALMTX_BAT_MAX_CURRENT          0       /* unknown */
 #define PALMTX_BAT_MIN_CURRENT          0       /* unknown */
 #define PALMTX_BAT_MAX_CHARGE           1       /* unknown */
 #define PALMTX_BAT_MIN_CHARGE           1       /* unknown */
diff --git a/arch/arm/mach-pxa/include/mach/palmz72.h b/arch/arm/mach-pxa/include/mach/palmz72.h
index 2806ef69ba5a..2bbcf70dd935 100644
--- a/arch/arm/mach-pxa/include/mach/palmz72.h
+++ b/arch/arm/mach-pxa/include/mach/palmz72.h
@@ -49,7 +49,7 @@
 /* Battery */
 #define PALMZ72_BAT_MAX_VOLTAGE         4000    /* 4.00v current voltage */
 #define PALMZ72_BAT_MIN_VOLTAGE         3550    /* 3.55v critical voltage */
-#define PALMZ72_BAT_MAX_CURRENT         0       /* unknokn */
+#define PALMZ72_BAT_MAX_CURRENT         0       /* unknown */
 #define PALMZ72_BAT_MIN_CURRENT         0       /* unknown */
 #define PALMZ72_BAT_MAX_CHARGE          1       /* unknown */
 #define PALMZ72_BAT_MIN_CHARGE          1       /* unknown */
author	Jiri Kosina <jkosina@suse.cz>	2009-12-07 12:36:35 -0500
committer	Jiri Kosina <jkosina@suse.cz>	2009-12-07 12:36:35 -0500
commit	d014d043869cdc591f3a33243d3481fa4479c2d0 (patch)
tree	63626829498e647ba058a1ce06419fe7e4d5f97d /arch/arm/mach-pxa/include/mach
parent	6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff)
parent	6070d81eb5f2d4943223c96e7609a53cdc984364 (diff)

diff --git a/arch/arm/mach-pxa/include/mach/palmld.h b/arch/arm/mach-pxa/include/mach/palmld.h index 8721b8010221..ae536e86d8e8 100644 --- a/arch/arm/mach-pxa/include/mach/palmld.h +++ b/arch/arm/mach-pxa/include/mach/palmld.h
@@ -91,7 +91,7 @@
91	/* BATTERY */	91	/* BATTERY */
92	#define PALMLD_BAT_MAX_VOLTAGE 4000 /* 4.00V maximum voltage */	92	#define PALMLD_BAT_MAX_VOLTAGE 4000 /* 4.00V maximum voltage */
93	#define PALMLD_BAT_MIN_VOLTAGE 3550 /* 3.55V critical voltage */	93	#define PALMLD_BAT_MIN_VOLTAGE 3550 /* 3.55V critical voltage */
94	#define PALMLD_BAT_MAX_CURRENT 0 /* unknokn */	94	#define PALMLD_BAT_MAX_CURRENT 0 /* unknown */
95	#define PALMLD_BAT_MIN_CURRENT 0 /* unknown */	95	#define PALMLD_BAT_MIN_CURRENT 0 /* unknown */
96	#define PALMLD_BAT_MAX_CHARGE 1 /* unknown */	96	#define PALMLD_BAT_MAX_CHARGE 1 /* unknown */
97	#define PALMLD_BAT_MIN_CHARGE 1 /* unknown */	97	#define PALMLD_BAT_MIN_CHARGE 1 /* unknown */


diff --git a/arch/arm/mach-pxa/include/mach/palmt5.h b/arch/arm/mach-pxa/include/mach/palmt5.h index d15662aba008..6baf7469d4ec 100644 --- a/arch/arm/mach-pxa/include/mach/palmt5.h +++ b/arch/arm/mach-pxa/include/mach/palmt5.h
@@ -66,7 +66,7 @@
66	/* BATTERY */	66	/* BATTERY */
67	#define PALMT5_BAT_MAX_VOLTAGE 4000 /* 4.00v current voltage */	67	#define PALMT5_BAT_MAX_VOLTAGE 4000 /* 4.00v current voltage */
68	#define PALMT5_BAT_MIN_VOLTAGE 3550 /* 3.55v critical voltage */	68	#define PALMT5_BAT_MIN_VOLTAGE 3550 /* 3.55v critical voltage */
69	#define PALMT5_BAT_MAX_CURRENT 0 /* unknokn */	69	#define PALMT5_BAT_MAX_CURRENT 0 /* unknown */
70	#define PALMT5_BAT_MIN_CURRENT 0 /* unknown */	70	#define PALMT5_BAT_MIN_CURRENT 0 /* unknown */
71	#define PALMT5_BAT_MAX_CHARGE 1 /* unknown */	71	#define PALMT5_BAT_MAX_CHARGE 1 /* unknown */
72	#define PALMT5_BAT_MIN_CHARGE 1 /* unknown */	72	#define PALMT5_BAT_MIN_CHARGE 1 /* unknown */


diff --git a/arch/arm/mach-pxa/include/mach/palmtc.h b/arch/arm/mach-pxa/include/mach/palmtc.h index 3dc9b074ab46..3f9dd3fd4638 100644 --- a/arch/arm/mach-pxa/include/mach/palmtc.h +++ b/arch/arm/mach-pxa/include/mach/palmtc.h
@@ -68,7 +68,7 @@
68	/* BATTERY */	68	/* BATTERY */
69	#define PALMTC_BAT_MAX_VOLTAGE 4000 /* 4.00V maximum voltage */	69	#define PALMTC_BAT_MAX_VOLTAGE 4000 /* 4.00V maximum voltage */
70	#define PALMTC_BAT_MIN_VOLTAGE 3550 /* 3.55V critical voltage */	70	#define PALMTC_BAT_MIN_VOLTAGE 3550 /* 3.55V critical voltage */
71	#define PALMTC_BAT_MAX_CURRENT 0 /* unknokn */	71	#define PALMTC_BAT_MAX_CURRENT 0 /* unknown */
72	#define PALMTC_BAT_MIN_CURRENT 0 /* unknown */	72	#define PALMTC_BAT_MIN_CURRENT 0 /* unknown */
73	#define PALMTC_BAT_MAX_CHARGE 1 /* unknown */	73	#define PALMTC_BAT_MAX_CHARGE 1 /* unknown */
74	#define PALMTC_BAT_MIN_CHARGE 1 /* unknown */	74	#define PALMTC_BAT_MIN_CHARGE 1 /* unknown */


diff --git a/arch/arm/mach-pxa/include/mach/palmte2.h b/arch/arm/mach-pxa/include/mach/palmte2.h index 12361341f9d8..f89e989a7637 100644 --- a/arch/arm/mach-pxa/include/mach/palmte2.h +++ b/arch/arm/mach-pxa/include/mach/palmte2.h
@@ -59,7 +59,7 @@
59	/* BATTERY */	59	/* BATTERY */
60	#define PALMTE2_BAT_MAX_VOLTAGE 4000 /* 4.00v current voltage */	60	#define PALMTE2_BAT_MAX_VOLTAGE 4000 /* 4.00v current voltage */
61	#define PALMTE2_BAT_MIN_VOLTAGE 3550 /* 3.55v critical voltage */	61	#define PALMTE2_BAT_MIN_VOLTAGE 3550 /* 3.55v critical voltage */
62	#define PALMTE2_BAT_MAX_CURRENT 0 /* unknokn */	62	#define PALMTE2_BAT_MAX_CURRENT 0 /* unknown */
63	#define PALMTE2_BAT_MIN_CURRENT 0 /* unknown */	63	#define PALMTE2_BAT_MIN_CURRENT 0 /* unknown */
64	#define PALMTE2_BAT_MAX_CHARGE 1 /* unknown */	64	#define PALMTE2_BAT_MAX_CHARGE 1 /* unknown */
65	#define PALMTE2_BAT_MIN_CHARGE 1 /* unknown */	65	#define PALMTE2_BAT_MIN_CHARGE 1 /* unknown */


diff --git a/arch/arm/mach-pxa/include/mach/palmtx.h b/arch/arm/mach-pxa/include/mach/palmtx.h index 1be0db6ed55e..10abc4f2e8e4 100644 --- a/arch/arm/mach-pxa/include/mach/palmtx.h +++ b/arch/arm/mach-pxa/include/mach/palmtx.h
@@ -94,7 +94,7 @@
94	/* BATTERY */	94	/* BATTERY */
95	#define PALMTX_BAT_MAX_VOLTAGE 4000 /* 4.00v current voltage */	95	#define PALMTX_BAT_MAX_VOLTAGE 4000 /* 4.00v current voltage */
96	#define PALMTX_BAT_MIN_VOLTAGE 3550 /* 3.55v critical voltage */	96	#define PALMTX_BAT_MIN_VOLTAGE 3550 /* 3.55v critical voltage */
97	#define PALMTX_BAT_MAX_CURRENT 0 /* unknokn */	97	#define PALMTX_BAT_MAX_CURRENT 0 /* unknown */
98	#define PALMTX_BAT_MIN_CURRENT 0 /* unknown */	98	#define PALMTX_BAT_MIN_CURRENT 0 /* unknown */
99	#define PALMTX_BAT_MAX_CHARGE 1 /* unknown */	99	#define PALMTX_BAT_MAX_CHARGE 1 /* unknown */
100	#define PALMTX_BAT_MIN_CHARGE 1 /* unknown */	100	#define PALMTX_BAT_MIN_CHARGE 1 /* unknown */


diff --git a/arch/arm/mach-pxa/include/mach/palmz72.h b/arch/arm/mach-pxa/include/mach/palmz72.h index 2806ef69ba5a..2bbcf70dd935 100644 --- a/arch/arm/mach-pxa/include/mach/palmz72.h +++ b/arch/arm/mach-pxa/include/mach/palmz72.h
@@ -49,7 +49,7 @@
49	/* Battery */	49	/* Battery */
50	#define PALMZ72_BAT_MAX_VOLTAGE 4000 /* 4.00v current voltage */	50	#define PALMZ72_BAT_MAX_VOLTAGE 4000 /* 4.00v current voltage */
51	#define PALMZ72_BAT_MIN_VOLTAGE 3550 /* 3.55v critical voltage */	51	#define PALMZ72_BAT_MIN_VOLTAGE 3550 /* 3.55v critical voltage */
52	#define PALMZ72_BAT_MAX_CURRENT 0 /* unknokn */	52	#define PALMZ72_BAT_MAX_CURRENT 0 /* unknown */
53	#define PALMZ72_BAT_MIN_CURRENT 0 /* unknown */	53	#define PALMZ72_BAT_MIN_CURRENT 0 /* unknown */
54	#define PALMZ72_BAT_MAX_CHARGE 1 /* unknown */	54	#define PALMZ72_BAT_MAX_CHARGE 1 /* unknown */
55	#define PALMZ72_BAT_MIN_CHARGE 1 /* unknown */	55	#define PALMZ72_BAT_MIN_CHARGE 1 /* unknown */