Prepare v2010.03-rc1
Coding style cleanup, update CHANGELOG.
Signed-off-by: Wolfgang Denk <wd@denx.de>
diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
index 9633858..ec71cfc 100644
--- a/drivers/mtd/nand/mxc_nand.c
+++ b/drivers/mtd/nand/mxc_nand.c
@@ -22,7 +22,7 @@
#include <nand.h>
#include <linux/err.h>
#include <asm/io.h>
-#if defined(CONFIG_MX27) || defined(CONFIG_MX25)
+#if defined(CONFIG_MX25) || defined(CONFIG_MX27)
#include <asm/arch/imx-regs.h>
#endif
@@ -857,8 +857,6 @@
}
#endif
-
-
static int mxc_nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat,
u_char *ecc_code)
{
diff --git a/drivers/spi/davinci_spi.c b/drivers/spi/davinci_spi.c
index ebc7f80..60ba007 100644
--- a/drivers/spi/davinci_spi.c
+++ b/drivers/spi/davinci_spi.c
@@ -220,4 +220,3 @@
{
/* do nothing */
}
-
diff --git a/drivers/usb/musb/da8xx.h b/drivers/usb/musb/da8xx.h
index 93234f0..b9660ba 100644
--- a/drivers/usb/musb/da8xx.h
+++ b/drivers/usb/musb/da8xx.h
@@ -100,4 +100,3 @@
#define DA8XX_USB_VBUS_GPIO (1 << 15)
#endif /* __DA8XX_MUSB_H__ */
-
diff --git a/drivers/usb/musb/omap3.h b/drivers/usb/musb/omap3.h
index 20fc9d2..b591862 100644
--- a/drivers/usb/musb/omap3.h
+++ b/drivers/usb/musb/omap3.h
@@ -45,4 +45,3 @@
int musb_platform_init(void);
#endif /* _MUSB_OMAP3_H */
-