git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal...
[pandora-kernel.git]
/
arch
/
arm
/
mach-mx5
/
board-mx53_evk.c
diff --git
a/arch/arm/mach-mx5/board-mx53_evk.c
b/arch/arm/mach-mx5/board-mx53_evk.c
index
2af3f43
..
f87d571
100644
(file)
--- a/
arch/arm/mach-mx5/board-mx53_evk.c
+++ b/
arch/arm/mach-mx5/board-mx53_evk.c
@@
-21,7
+21,6
@@
#include <linux/init.h>
#include <linux/clk.h>
#include <linux/init.h>
#include <linux/clk.h>
-#include <linux/fec.h>
#include <linux/delay.h>
#include <linux/gpio.h>
#include <linux/spi/flash.h>
#include <linux/delay.h>
#include <linux/gpio.h>
#include <linux/spi/flash.h>
@@
-31,7
+30,6
@@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
-#include <mach/imx-uart.h>
#include <mach/iomux-mx53.h>
#define MX53_EVK_FEC_PHY_RST IMX_GPIO_NR(7, 6)
#include <mach/iomux-mx53.h>
#define MX53_EVK_FEC_PHY_RST IMX_GPIO_NR(7, 6)