aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-03-25 06:15:00 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-03-25 06:15:00 -0400
commite63cedb656683739eea2696114bc56888e9bff05 (patch)
tree4d13002ccf74577209972518c46a5fb2c3c13add
parent17a92a788e3cebca8a817f01e3c0f121f700ee0e (diff)
[ARM] collie: fix two minor formatting nits
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mach-sa1100/collie.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c
index a911f44aa9fc..bbf2ebcc3066 100644
--- a/arch/arm/mach-sa1100/collie.c
+++ b/arch/arm/mach-sa1100/collie.c
@@ -146,7 +146,8 @@ static struct locomo_driver collie_uart_driver = {
146 .remove = collie_uart_remove, 146 .remove = collie_uart_remove,
147}; 147};
148 148
149static int __init collie_uart_init(void) { 149static int __init collie_uart_init(void)
150{
150 return locomo_driver_register(&collie_uart_driver); 151 return locomo_driver_register(&collie_uart_driver);
151} 152}
152device_initcall(collie_uart_init); 153device_initcall(collie_uart_init);
@@ -198,8 +199,7 @@ static struct mtd_partition collie_partitions[] = {
198 199
199static int collie_flash_init(void) 200static int collie_flash_init(void)
200{ 201{
201 int rc; 202 int rc = gpio_request(COLLIE_GPIO_VPEN, "flash Vpp enable");
202 rc = gpio_request(COLLIE_GPIO_VPEN, "flash Vpp enable");
203 if (rc) 203 if (rc)
204 return rc; 204 return rc;
205 205
@@ -219,6 +219,7 @@ static void collie_flash_exit(void)
219{ 219{
220 gpio_free(COLLIE_GPIO_VPEN); 220 gpio_free(COLLIE_GPIO_VPEN);
221} 221}
222
222static struct flash_platform_data collie_flash_data = { 223static struct flash_platform_data collie_flash_data = {
223 .map_name = "cfi_probe", 224 .map_name = "cfi_probe",
224 .init = collie_flash_init, 225 .init = collie_flash_init,