From aa1742aca999cf2c812d0b298df33e257c3f1aff Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Mon, 21 Apr 2008 22:26:40 +0000 Subject: [PATCH] --- yaml --- r: 91749 b: refs/heads/master c: b1d18dc06ba6b9056f95aaf1f8c464830846f87f h: refs/heads/master i: 91747: a3fd32acfbb92b61943134cf64a4b3020070cbef v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-pxa/mfp.c | 6 +++--- trunk/include/asm-arm/hardware/iop3xx-adma.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 8cc95b2e1a14..c2c2e41a9093 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f76d9841e9cf6dd969ff3aec96476dced9c53f8 +refs/heads/master: b1d18dc06ba6b9056f95aaf1f8c464830846f87f diff --git a/trunk/arch/arm/mach-pxa/mfp.c b/trunk/arch/arm/mach-pxa/mfp.c index f5809adce298..9646b048f01c 100644 --- a/trunk/arch/arm/mach-pxa/mfp.c +++ b/trunk/arch/arm/mach-pxa/mfp.c @@ -42,7 +42,7 @@ struct pxa3xx_mfp_pin { static struct pxa3xx_mfp_pin mfp_table[MFP_PIN_MAX]; /* mapping of MFP_LPM_* definitions to MFPR_LPM_* register bits */ -const static unsigned long mfpr_lpm[] = { +static const unsigned long mfpr_lpm[] = { MFPR_LPM_INPUT, MFPR_LPM_DRIVE_LOW, MFPR_LPM_DRIVE_HIGH, @@ -52,7 +52,7 @@ const static unsigned long mfpr_lpm[] = { }; /* mapping of MFP_PULL_* definitions to MFPR_PULL_* register bits */ -const static unsigned long mfpr_pull[] = { +static const unsigned long mfpr_pull[] = { MFPR_PULL_NONE, MFPR_PULL_LOW, MFPR_PULL_HIGH, @@ -60,7 +60,7 @@ const static unsigned long mfpr_pull[] = { }; /* mapping of MFP_LPM_EDGE_* definitions to MFPR_EDGE_* register bits */ -const static unsigned long mfpr_edge[] = { +static const unsigned long mfpr_edge[] = { MFPR_EDGE_NONE, MFPR_EDGE_RISE, MFPR_EDGE_FALL, diff --git a/trunk/include/asm-arm/hardware/iop3xx-adma.h b/trunk/include/asm-arm/hardware/iop3xx-adma.h index 84d635b0a71a..a32b86ac62aa 100644 --- a/trunk/include/asm-arm/hardware/iop3xx-adma.h +++ b/trunk/include/asm-arm/hardware/iop3xx-adma.h @@ -260,7 +260,7 @@ static inline int iop_chan_memset_slot_count(size_t len, int *slots_per_op) static inline int iop3xx_aau_xor_slot_count(size_t len, int src_cnt, int *slots_per_op) { - const static int slot_count_table[] = { 0, + static const int slot_count_table[] = { 0, 1, 1, 1, 1, /* 01 - 04 */ 2, 2, 2, 2, /* 05 - 08 */ 4, 4, 4, 4, /* 09 - 12 */ @@ -369,7 +369,7 @@ static inline u32 iop_desc_get_byte_count(struct iop_adma_desc_slot *desc, /* translate the src_idx to a descriptor word index */ static inline int __desc_idx(int src_idx) { - const static int desc_idx_table[] = { 0, 0, 0, 0, + static const int desc_idx_table[] = { 0, 0, 0, 0, 0, 1, 2, 3, 5, 6, 7, 8, 9, 10, 11, 12,