diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-12-27 01:12:56 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-12-27 01:12:56 +0100 |
| commit | 81b38be8631a0b809c97ab3d929f491373d7314f (patch) | |
| tree | 0dd6444e2b602dcd06524f57c234b1f3b18ceb83 /drivers/serial/Makefile | |
| parent | f77ac3d657e9b1d40012153e872a2118cca10a3d (diff) | |
| parent | 29592ecba3b932b9b152bcec6c0c0806412db4a3 (diff) | |
| download | u-boot-imx-81b38be8631a0b809c97ab3d929f491373d7314f.zip u-boot-imx-81b38be8631a0b809c97ab3d929f491373d7314f.tar.gz u-boot-imx-81b38be8631a0b809c97ab3d929f491373d7314f.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-sh
Conflicts:
MAINTAINERS
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'drivers/serial/Makefile')
| -rw-r--r-- | drivers/serial/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile index 735c630..ee2b780 100644 --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile @@ -35,6 +35,7 @@ COBJS-y += serial_max3100.o COBJS-y += serial_pl010.o COBJS-y += serial_pl011.o COBJS-y += serial_xuartlite.o +COBJS-y += serial_sh.o COBJS-y += usbtty.o COBJS := $(COBJS-y) |