Merge branch 'hs@denx.de' of git://git.denx.de/u-boot-staging

* 'hs@denx.de' of git://git.denx.de/u-boot-staging:
  drivers/net/dnet.c: Fix GCC 4.6 warnings
  board/xaeniax/flash.c: Fix GCC 4.6 warnings
  net/bootp.c: Fix GCC 4.6 warning
  common/cmd_bootm.c: Fix GCC 4.6 warnings
  board/mx1ads/mx1ads.c: Fix GCC 4.6 warning
  board/mx1ads/syncflash.c: Fix GCC 4.6 warnings
  board/lubbock/flash.c: Fix GCC 4.6 warnings
  drivers/net/cs8900.c: Fix GCC 4.6 warning
  arch/arm/cpu/arm926ejs/omap/cpuinfo.c: Fix GCC 4.6 warnings
  drivers/net/lan91c96.c: Fix GCC 4.6 warning
  board/ronetix/pm9263/pm9263.c: Fix GCC 4.6 warning
  drivers/mtd/onenand/samsung.c: Fix GCC 4.6 warning
  drivers/usb/musb/musb_hcd.c: Fix GCC 4.6 warning

diff --combined board/ronetix/pm9263/pm9263.c
index b0f7ea6ddba4692925d714b29ff74bc18b834fad,4b6fd663e65a60f2904686f908fcd526b24105de..335efba8edc05ec645a68ddfa5e5054a2f4150ce
--- 1/board/ronetix/pm9263/pm9263.c
--- 2/board/ronetix/pm9263/pm9263.c
+++ b/board/ronetix/pm9263/pm9263.c
@@@ -164,7 -164,6 +164,6 @@@ void lcd_disable(void
  /* Initialize the PSRAM memory */
  static int pm9263_lcd_hw_psram_init(void)
  {
-       volatile uint16_t x;
        unsigned long csa;
        struct at91_smc *smc = (struct at91_smc *)ATMEL_BASE_SMC1;
        struct at91_matrix *matrix = (struct at91_matrix *)ATMEL_BASE_MATRIX;
@@@ -196,14 -195,14 +195,14 @@@
        at91_set_pio_value(PSRAM_CRE_PIN, 0);   /* set PSRAM_CRE_PIN to '0' */
  
        /* PSRAM: write BCR */
-       x = readw(PSRAM_CTRL_REG);
-       x = readw(PSRAM_CTRL_REG);
+       readw(PSRAM_CTRL_REG);
+       readw(PSRAM_CTRL_REG);
        writew(1, PSRAM_CTRL_REG);      /* 0 - RCR,1 - BCR */
        writew(0x9d4f, PSRAM_CTRL_REG); /* write the BCR */
  
        /* write RCR of the PSRAM */
-       x = readw(PSRAM_CTRL_REG);
-       x = readw(PSRAM_CTRL_REG);
+       readw(PSRAM_CTRL_REG);
+       readw(PSRAM_CTRL_REG);
        writew(0, PSRAM_CTRL_REG);      /* 0 - RCR,1 - BCR */
        /* set RCR; 0x10-async mode,0x90-page mode */
        writew(0x90, PSRAM_CTRL_REG);
@@@ -222,8 -221,8 +221,8 @@@
                at91_set_pio_value(PSRAM_CRE_PIN, 1); /* set PSRAM_CRE_PIN to '1' */
  
                /* write RCR of the PSRAM */
-               x = readw(PSRAM_CTRL_REG);
-               x = readw(PSRAM_CTRL_REG);
+               readw(PSRAM_CTRL_REG);
+               readw(PSRAM_CTRL_REG);
                writew(0, PSRAM_CTRL_REG);      /* 0 - RCR,1 - BCR */
                /* set RCR;0x10-async mode,0x90-page mode */
                writew(0x90, PSRAM_CTRL_REG);
@@@ -349,6 -348,9 +348,6 @@@ int board_init(void
                (1 << ATMEL_ID_PIOB),
                &pmc->pcer);
  
 -      /* arch number of AT91SAM9263EK-Board */
 -      gd->bd->bi_arch_number = MACH_TYPE_PM9263;
 -
        /* adress of boot parameters */
        gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;