aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-sa1100
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-03-25 10:15:00 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-03-25 10:15:00 +0000
commite63cedb656683739eea2696114bc56888e9bff05 (patch)
tree4d13002ccf74577209972518c46a5fb2c3c13add /arch/arm/mach-sa1100
parent17a92a788e3cebca8a817f01e3c0f121f700ee0e (diff)
downloadlinux-2.6.34-ux500-e63cedb656683739eea2696114bc56888e9bff05.tar.gz
[ARM] collie: fix two minor formatting nits
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-sa1100')
-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 a911f44aa9f..bbf2ebcc306 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 = {
.remove = collie_uart_remove,
};
-static int __init collie_uart_init(void) {
+static int __init collie_uart_init(void)
+{
return locomo_driver_register(&collie_uart_driver);
}
device_initcall(collie_uart_init);
@@ -198,8 +199,7 @@ static struct mtd_partition collie_partitions[] = {
static int collie_flash_init(void)
{
- int rc;
- rc = gpio_request(COLLIE_GPIO_VPEN, "flash Vpp enable");
+ int rc = gpio_request(COLLIE_GPIO_VPEN, "flash Vpp enable");
if (rc)
return rc;
@@ -219,6 +219,7 @@ static void collie_flash_exit(void)
{
gpio_free(COLLIE_GPIO_VPEN);
}
+
static struct flash_platform_data collie_flash_data = {
.map_name = "cfi_probe",
.init = collie_flash_init,