git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
arch
/
blackfin
/
mach-bf527
/
boards
/
tll6527m.c
diff --git
a/arch/blackfin/mach-bf527/boards/tll6527m.c
b/arch/blackfin/mach-bf527/boards/tll6527m.c
index
130861b
..
18d303d
100644
(file)
--- a/
arch/blackfin/mach-bf527/boards/tll6527m.c
+++ b/
arch/blackfin/mach-bf527/boards/tll6527m.c
@@
-193,7
+193,7
@@
static unsigned gpio_addr_inputs[] = {
GPIO_PG1, GPIO_PH9, GPIO_PH10
};
GPIO_PG1, GPIO_PH9, GPIO_PH10
};
-static struct gpio_decoder_platf
ro
m_data spi_decoded_cs = {
+static struct gpio_decoder_platf
or
m_data spi_decoded_cs = {
.base = EXP_GPIO_SPISEL_BASE,
.input_addrs = gpio_addr_inputs,
.nr_input_addrs = ARRAY_SIZE(gpio_addr_inputs),
.base = EXP_GPIO_SPISEL_BASE,
.input_addrs = gpio_addr_inputs,
.nr_input_addrs = ARRAY_SIZE(gpio_addr_inputs),
@@
-586,7
+586,7
@@
static struct resource bfin_uart0_resources[] = {
},
};
},
};
-unsigned short bfin_uart0_peripherals[] = {
+
static
unsigned short bfin_uart0_peripherals[] = {
P_UART0_TX, P_UART0_RX, 0
};
P_UART0_TX, P_UART0_RX, 0
};
@@
-642,7
+642,7
@@
static struct resource bfin_uart1_resources[] = {
#endif
};
#endif
};
-unsigned short bfin_uart1_peripherals[] = {
+
static
unsigned short bfin_uart1_peripherals[] = {
P_UART1_TX, P_UART1_RX, 0
};
P_UART1_TX, P_UART1_RX, 0
};
@@
-799,9
+799,9
@@
static struct resource bfin_sport0_uart_resources[] = {
},
};
},
};
-unsigned short bfin_sport0_peripherals[] = {
+
static
unsigned short bfin_sport0_peripherals[] = {
P_SPORT0_TFS, P_SPORT0_DTPRI, P_SPORT0_TSCLK, P_SPORT0_RFS,
P_SPORT0_TFS, P_SPORT0_DTPRI, P_SPORT0_TSCLK, P_SPORT0_RFS,
- P_SPORT0_DRPRI, P_SPORT0_RSCLK,
P_SPORT0_DRSEC, P_SPORT0_DTSEC,
0
+ P_SPORT0_DRPRI, P_SPORT0_RSCLK, 0
};
static struct platform_device bfin_sport0_uart_device = {
};
static struct platform_device bfin_sport0_uart_device = {
@@
-834,9
+834,9
@@
static struct resource bfin_sport1_uart_resources[] = {
},
};
},
};
-unsigned short bfin_sport1_peripherals[] = {
+
static
unsigned short bfin_sport1_peripherals[] = {
P_SPORT1_TFS, P_SPORT1_DTPRI, P_SPORT1_TSCLK, P_SPORT1_RFS,
P_SPORT1_TFS, P_SPORT1_DTPRI, P_SPORT1_TSCLK, P_SPORT1_RFS,
- P_SPORT1_DRPRI, P_SPORT1_RSCLK,
P_SPORT1_DRSEC, P_SPORT1_DTSEC,
0
+ P_SPORT1_DRPRI, P_SPORT1_RSCLK, 0
};
static struct platform_device bfin_sport1_uart_device = {
};
static struct platform_device bfin_sport1_uart_device = {