Merge with git://www.denx.de/git/u-boot.git

[oweals/u-boot.git] / board / rbc823 / kbd.c

diff --git a/board/rbc823/kbd.c b/board/rbc823/kbd.c
index f1424e4700bc505762b5a43d4ea7877cd25769e8..6d530f6b431cf9d16fc023e2365ba23a74244e06 100644 (file)
--- a/board/rbc823/kbd.c
+++ b/board/rbc823/kbd.c
@@ -33,6 +33,8 @@
 #include <devices.h>
 #include <lcd.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 #define        SMC_INDEX       0
 #define PROFF_SMC      PROFF_SMC1
 #define CPM_CR_CH_SMC  CPM_CR_CH_SMC1
@@ -46,9 +48,7 @@
 
 void smc1_setbrg (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
-        volatile immap_t *im = (immap_t *)CFG_IMMR;
+       volatile immap_t *im = (immap_t *)CFG_IMMR;
        volatile cpm8xx_t *cp = &(im->im_cpm);
 
        /* Set up the baud rate generator.
@@ -65,7 +65,7 @@ void smc1_setbrg (void)
 
 int smc1_init (void)
 {
-        volatile immap_t *im = (immap_t *)CFG_IMMR;
+       volatile immap_t *im = (immap_t *)CFG_IMMR;
        volatile smc_t *sp;
        volatile smc_uart_t *up;
        volatile cbd_t *tbdf, *rbdf;
@@ -182,7 +182,7 @@ void smc1_putc(const char c)
        volatile cbd_t          *tbdf;
        volatile char           *buf;
        volatile smc_uart_t     *up;
-        volatile immap_t       *im = (immap_t *)CFG_IMMR;
+       volatile immap_t        *im = (immap_t *)CFG_IMMR;
        volatile cpm8xx_t       *cpmp = &(im->im_cpm);
 
        up = (smc_uart_t *)&cpmp->cp_dparam[PROFF_SMC];
@@ -210,7 +210,7 @@ int smc1_getc(void)
        volatile cbd_t          *rbdf;
        volatile unsigned char  *buf;
        volatile smc_uart_t     *up;
-        volatile immap_t       *im = (immap_t *)CFG_IMMR;
+       volatile immap_t        *im = (immap_t *)CFG_IMMR;
        volatile cpm8xx_t       *cpmp = &(im->im_cpm);
        unsigned char           c;
 
@@ -235,7 +235,7 @@ int smc1_tstc(void)
 {
        volatile cbd_t          *rbdf;
        volatile smc_uart_t     *up;
-        volatile immap_t       *im = (immap_t *)CFG_IMMR;
+       volatile immap_t        *im = (immap_t *)CFG_IMMR;
        volatile cpm8xx_t       *cpmp = &(im->im_cpm);
 
        up = (smc_uart_t *)&cpmp->cp_dparam[PROFF_SMC];