summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPeter Pearse <peter.pearse@arm.com>2007-09-18 13:07:54 +0100
committerPeter Pearse <peter.pearse@arm.com>2007-09-18 13:07:54 +0100
commitbd86220f58b99d6896198c385fda132f0c980915 (patch)
tree33ff54c9cc3ee2fc49ae6c2dab38456c3e023f7a /include
parentafd477b227c089f2b7ce0aadb20b9ea7dc6ee6f8 (diff)
downloadu-boot-imx-bd86220f58b99d6896198c385fda132f0c980915.zip
u-boot-imx-bd86220f58b99d6896198c385fda132f0c980915.tar.gz
u-boot-imx-bd86220f58b99d6896198c385fda132f0c980915.tar.bz2
Move coloured led API to status_led.h
Improve indentation in drivers/at45.c
Diffstat (limited to 'include')
-rw-r--r--include/asm-arm/coloured_led.h45
-rw-r--r--include/status_led.h21
2 files changed, 21 insertions, 45 deletions
diff --git a/include/asm-arm/coloured_led.h b/include/asm-arm/coloured_led.h
deleted file mode 100644
index f78a4b1..0000000
--- a/include/asm-arm/coloured_led.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * (C) Copyright 2006
- * Atmel Nordic AB <www.atmel.com>
- * Ulf Samuelsson <ulf@atmel.com>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#ifndef __LED_H
-#define __LED_H
-
-#ifndef __ASSEMBLY__
-extern void coloured_LED_init (void);
-extern void red_LED_on(void);
-extern void red_LED_off(void);
-extern void green_LED_on(void);
-extern void green_LED_off(void);
-extern void yellow_LED_on(void);
-extern void yellow_LED_off(void);
-#else
- .extern LED_init
- .extern red_LED_on
- .extern red_LED_off
- .extern yellow_LED_on
- .extern yellow_LED_off
- .extern green_LED_on
- .extern green_LED_off
-#endif
-#endif
diff --git a/include/status_led.h b/include/status_led.h
index a646814..74e2147 100644
--- a/include/status_led.h
+++ b/include/status_led.h
@@ -383,6 +383,27 @@ extern void __led_set (led_id_t mask, int state);
# include <asm/status_led.h>
#endif
+/*
+ * Coloured LEDs API
+ */
+#ifndef __ASSEMBLY__
+extern void coloured_LED_init (void);
+extern void red_LED_on(void);
+extern void red_LED_off(void);
+extern void green_LED_on(void);
+extern void green_LED_off(void);
+extern void yellow_LED_on(void);
+extern void yellow_LED_off(void);
+#else
+ .extern LED_init
+ .extern red_LED_on
+ .extern red_LED_off
+ .extern yellow_LED_on
+ .extern yellow_LED_off
+ .extern green_LED_on
+ .extern green_LED_off
+#endif
+
#endif /* CONFIG_STATUS_LED */
#endif /* _STATUS_LED_H_ */