diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-01-09 17:38:26 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-01-09 17:38:26 +0100 |
| commit | 39c6c3480a9cb88e722af1142c7b31a00e9ec546 (patch) | |
| tree | 3381f97f7485a14df8f2c47249d1aedfa509d205 /drivers/serial | |
| parent | ff6383c8e4bde31036fbd31f7961539be288d6af (diff) | |
| parent | bdcdcaad8199aba9774197e6f3296f659d30c399 (diff) | |
| download | barebox-39c6c3480a9cb88e722af1142c7b31a00e9ec546.tar.gz barebox-39c6c3480a9cb88e722af1142c7b31a00e9ec546.tar.xz | |
Merge branch 'for-next/mxs'
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/serial_auart.c | 1 | ||||
| -rw-r--r-- | drivers/serial/stm-serial.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/serial/serial_auart.c b/drivers/serial/serial_auart.c index ae6c5b8219..87b2e33ca3 100644 --- a/drivers/serial/serial_auart.c +++ b/drivers/serial/serial_auart.c @@ -47,7 +47,6 @@ #include <linux/err.h> #include <mach/clock.h> -#include <mach/imx-regs.h> #define HW_UARTAPP_CTRL0 (0x00000000) diff --git a/drivers/serial/stm-serial.c b/drivers/serial/stm-serial.c index 39ff7ae942..e5f57dc6e7 100644 --- a/drivers/serial/stm-serial.c +++ b/drivers/serial/stm-serial.c @@ -31,7 +31,6 @@ #include <malloc.h> #include <linux/clk.h> #include <linux/err.h> -#include <mach/imx-regs.h> #include <mach/clock.h> #define UARTDBGDR 0x00 |