diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-02-19 07:15:01 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-02-19 07:15:01 +0100 |
| commit | a87a0ce7028d5371c81d77ba72c1ba43a1ca77bc (patch) | |
| tree | 98bff4a88314611dc6f7afea5f88953309940a51 /drivers/serial/serial.c | |
| parent | c4d376fd1c2bce8d64cec0431dd3f24957b6dec4 (diff) | |
| parent | f8d1086851409ee16344932ef367b8a05c365b09 (diff) | |
| download | talos-obmc-uboot-a87a0ce7028d5371c81d77ba72c1ba43a1ca77bc.tar.gz talos-obmc-uboot-a87a0ce7028d5371c81d77ba72c1ba43a1ca77bc.zip | |
Merge branch 'u-boot-pxa/master' into 'u-boot-arm/master'
Diffstat (limited to 'drivers/serial/serial.c')
| -rw-r--r-- | drivers/serial/serial.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c index 05cb369821..df05bde461 100644 --- a/drivers/serial/serial.c +++ b/drivers/serial/serial.c @@ -150,7 +150,6 @@ serial_initfunc(oc_serial_initialize); serial_initfunc(sandbox_serial_initialize); serial_initfunc(clps7111_serial_initialize); serial_initfunc(imx_serial_initialize); -serial_initfunc(ixp_serial_initialize); serial_initfunc(ks8695_serial_initialize); serial_initfunc(lh7a40x_serial_initialize); serial_initfunc(max3100_serial_initialize); @@ -244,7 +243,6 @@ void serial_initialize(void) sandbox_serial_initialize(); clps7111_serial_initialize(); imx_serial_initialize(); - ixp_serial_initialize(); ks8695_serial_initialize(); lh7a40x_serial_initialize(); max3100_serial_initialize(); |
