diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 22:43:33 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 22:43:33 -0500 |
commit | 4ef58d4e2ad1fa2a3e5bbf41af2284671fca8cf8 (patch) | |
tree | 856ba96302a36014736747e8464f80eeb827bbdd /arch/arm/mach-pxa | |
parent | f6c4c8195b5e7878823caa1181be404d9e86d369 (diff) | |
parent | d014d043869cdc591f3a33243d3481fa4479c2d0 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (42 commits)
tree-wide: fix misspelling of "definition" in comments
reiserfs: fix misspelling of "journaled"
doc: Fix a typo in slub.txt.
inotify: remove superfluous return code check
hdlc: spelling fix in find_pvc() comment
doc: fix regulator docs cut-and-pasteism
mtd: Fix comment in Kconfig
doc: Fix IRQ chip docs
tree-wide: fix assorted typos all over the place
drivers/ata/libata-sff.c: comment spelling fixes
fix typos/grammos in Documentation/edac.txt
sysctl: add missing comments
fs/debugfs/inode.c: fix comment typos
sgivwfb: Make use of ARRAY_SIZE.
sky2: fix sky2_link_down copy/paste comment error
tree-wide: fix typos "couter" -> "counter"
tree-wide: fix typos "offest" -> "offset"
fix kerneldoc for set_irq_msi()
spidev: fix double "of of" in comment
comment typo fix: sybsystem -> subsystem
...
Diffstat (limited to 'arch/arm/mach-pxa')
-rw-r--r-- | arch/arm/mach-pxa/include/mach/palmld.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/palmt5.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/palmtc.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/palmte2.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/palmtx.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/palmz72.h | 2 |
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 @@ | |||
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 */ |