Merge branch 'master' of git://git.denx.de/u-boot-video

2008-10-28 08:37:19 +01:00
parent a369f4a492 6b59e03e02
commit d35c451d6c
10 changed files with 195 additions and 85 deletions
--- a/include/asm-arm/arch-at91/gpio.h
+++ b/include/asm-arm/arch-at91/gpio.h
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <asm/errno.h>
 #include <asm/arch/at91_pio.h>
+#include <asm/arch/hardware.h>

 #define PIN_BASE		32

--- a/include/lcd.h
+++ b/include/lcd.h
@@ -197,6 +197,8 @@ void	lcd_putc	(const char c);
 void	lcd_puts	(const char *s);
 void	lcd_printf	(const char *fmt, ...);

+/* Allow boards to customize the information displayed */
+void lcd_show_board_info(void);

 /************************************************************************/
 /* ** BITMAP DISPLAY SUPPORT						*/