diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-21 19:36:46 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-21 19:36:46 -0400 |
| commit | e9b62693ae0a1e13ccc97a6792d9a7770c8d1b5b (patch) | |
| tree | c676609730533fc1b7c5e01992e46b6eaf75f99b /arch | |
| parent | 548453fd107f789f5f1bc2dc13cc432ceb3b5efd (diff) | |
| parent | 838cb6aba4cebcf4fcd06b90e2adf890bef884ac (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial: (24 commits)
DOC: A couple corrections and clarifications in USB doc.
Generate a slightly more informative error msg for bad HZ
fix typo "is" -> "if" in Makefile
ext*: spelling fix prefered -> preferred
DOCUMENTATION: Use newer DEFINE_SPINLOCK macro in docs.
KEYS: Fix the comment to match the file name in rxrpc-type.h.
RAID: remove trailing space from printk line
DMA engine: typo fixes
Remove unused MAX_NODES_SHIFT
MAINTAINERS: Clarify access to OCFS2 development mailing list.
V4L: Storage class should be before const qualifier (sn9c102)
V4L: Storage class should be before const qualifier
sonypi: Storage class should be before const qualifier
intel_menlow: Storage class should be before const qualifier
DVB: Storage class should be before const qualifier
arm: Storage class should be before const qualifier
ALSA: Storage class should be before const qualifier
acpi: Storage class should be before const qualifier
firmware_sample_driver.c: fix coding style
MAINTAINERS: Add ati_remote2 driver
...
Fixed up trivial conflicts in firmware_sample_driver.c
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-pxa/mfp-pxa3xx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/mfp-pxa3xx.c b/arch/arm/mach-pxa/mfp-pxa3xx.c index b84c3ba7a8d6..3a5b0fcbaf1f 100644 --- a/arch/arm/mach-pxa/mfp-pxa3xx.c +++ b/arch/arm/mach-pxa/mfp-pxa3xx.c | |||
| @@ -42,7 +42,7 @@ struct pxa3xx_mfp_pin { | |||
| 42 | static struct pxa3xx_mfp_pin mfp_table[MFP_PIN_MAX]; | 42 | static struct pxa3xx_mfp_pin mfp_table[MFP_PIN_MAX]; |
| 43 | 43 | ||
| 44 | /* mapping of MFP_LPM_* definitions to MFPR_LPM_* register bits */ | 44 | /* mapping of MFP_LPM_* definitions to MFPR_LPM_* register bits */ |
| 45 | const static unsigned long mfpr_lpm[] = { | 45 | static const unsigned long mfpr_lpm[] = { |
| 46 | MFPR_LPM_INPUT, | 46 | MFPR_LPM_INPUT, |
| 47 | MFPR_LPM_DRIVE_LOW, | 47 | MFPR_LPM_DRIVE_LOW, |
| 48 | MFPR_LPM_DRIVE_HIGH, | 48 | MFPR_LPM_DRIVE_HIGH, |
| @@ -52,7 +52,7 @@ const static unsigned long mfpr_lpm[] = { | |||
| 52 | }; | 52 | }; |
| 53 | 53 | ||
| 54 | /* mapping of MFP_PULL_* definitions to MFPR_PULL_* register bits */ | 54 | /* mapping of MFP_PULL_* definitions to MFPR_PULL_* register bits */ |
| 55 | const static unsigned long mfpr_pull[] = { | 55 | static const unsigned long mfpr_pull[] = { |
| 56 | MFPR_PULL_NONE, | 56 | MFPR_PULL_NONE, |
| 57 | MFPR_PULL_LOW, | 57 | MFPR_PULL_LOW, |
| 58 | MFPR_PULL_HIGH, | 58 | MFPR_PULL_HIGH, |
| @@ -60,7 +60,7 @@ const static unsigned long mfpr_pull[] = { | |||
| 60 | }; | 60 | }; |
| 61 | 61 | ||
| 62 | /* mapping of MFP_LPM_EDGE_* definitions to MFPR_EDGE_* register bits */ | 62 | /* mapping of MFP_LPM_EDGE_* definitions to MFPR_EDGE_* register bits */ |
| 63 | const static unsigned long mfpr_edge[] = { | 63 | static const unsigned long mfpr_edge[] = { |
| 64 | MFPR_EDGE_NONE, | 64 | MFPR_EDGE_NONE, |
| 65 | MFPR_EDGE_RISE, | 65 | MFPR_EDGE_RISE, |
| 66 | MFPR_EDGE_FALL, | 66 | MFPR_EDGE_FALL, |