diff options
author | Wolfgang Denk <wd@denx.de> | 2010-06-17 22:22:06 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2010-06-17 22:22:06 +0200 |
commit | cecda170e7816d10edf0f5e64c420e9c618001ec (patch) | |
tree | 6b3d539057e9719818cfd671e77eaef08e1d255c /drivers | |
parent | 530135dcacac278798346ad5825c03131ce51772 (diff) | |
parent | ce9c227cc71afc3b4c78dcc0a565c40d4ad943e4 (diff) | |
download | u-boot-imx-cecda170e7816d10edf0f5e64c420e9c618001ec.zip u-boot-imx-cecda170e7816d10edf0f5e64c420e9c618001ec.tar.gz u-boot-imx-cecda170e7816d10edf0f5e64c420e9c618001ec.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-marvell
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/serial/serial.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c index 8eda95c..1073ac0 100644 --- a/drivers/serial/serial.c +++ b/drivers/serial/serial.c @@ -30,6 +30,9 @@ #ifdef CONFIG_KIRKWOOD #include <asm/arch/kirkwood.h> #endif +#ifdef CONFIG_ORION5X +#include <asm/arch/orion5x.h> +#endif #if defined (CONFIG_SERIAL_MULTI) #include <serial.h> |