summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-03-12 23:06:04 +0100
committerWolfgang Denk <wd@denx.de>2010-03-12 23:06:04 +0100
commit93910edb595a88d394da3eb2cf5148096155dfe9 (patch)
treefc14bd3093f04c730b5c8d79e57707fada0d6159 /drivers
parent4e72fb15c9073129e05820cc9c54f54bc4985835 (diff)
Prepare v2010.03-rc1v2010.03-rc1
Coding style cleanup, update CHANGELOG. Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mtd/nand/mxc_nand.c4
-rw-r--r--drivers/spi/davinci_spi.c1
-rw-r--r--drivers/usb/musb/da8xx.h1
-rw-r--r--drivers/usb/musb/omap3.h1
4 files changed, 1 insertions, 6 deletions
diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
index 9633858a7d5..ec71cfcaf27 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 @@ static int mxc_nand_correct_data(struct mtd_info *mtd, u_char *dat,
}
#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 ebc7f8082ba..60ba007aaab 100644
--- a/drivers/spi/davinci_spi.c
+++ b/drivers/spi/davinci_spi.c
@@ -220,4 +220,3 @@ void spi_cs_deactivate(struct spi_slave *slave)
{
/* do nothing */
}
-
diff --git a/drivers/usb/musb/da8xx.h b/drivers/usb/musb/da8xx.h
index 93234f0dd4b..b9660ba8097 100644
--- a/drivers/usb/musb/da8xx.h
+++ b/drivers/usb/musb/da8xx.h
@@ -100,4 +100,3 @@ struct da8xx_usb_regs {
#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 20fc9d294a2..b591862b2d2 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 */
-