---

yaml --- r: 137452 b: refs/heads/master c: e63cedb h: refs/heads/master v: v3
git-mirror · Mar 25, 2009 · f3cf4ed · f3cf4ed
1 parent f16e2e6
commit f3cf4ed
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17a92a788e3cebca8a817f01e3c0f121f700ee0e
+refs/heads/master: e63cedb656683739eea2696114bc56888e9bff05
diff --git a/trunk/arch/arm/mach-sa1100/collie.c b/trunk/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,