diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/serial/Makefile | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/serial/Makefile')
| -rw-r--r-- | drivers/serial/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile index d21d5dd5d048..6aa4723b74ee 100644 --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile | |||
| @@ -45,6 +45,7 @@ obj-$(CONFIG_SERIAL_S3C2440) += s3c2440.o | |||
| 45 | obj-$(CONFIG_SERIAL_S3C24A0) += s3c24a0.o | 45 | obj-$(CONFIG_SERIAL_S3C24A0) += s3c24a0.o |
| 46 | obj-$(CONFIG_SERIAL_S3C6400) += s3c6400.o | 46 | obj-$(CONFIG_SERIAL_S3C6400) += s3c6400.o |
| 47 | obj-$(CONFIG_SERIAL_S5PC100) += s3c6400.o | 47 | obj-$(CONFIG_SERIAL_S5PC100) += s3c6400.o |
| 48 | obj-$(CONFIG_SERIAL_S5PV210) += s5pv210.o | ||
| 48 | obj-$(CONFIG_SERIAL_MAX3100) += max3100.o | 49 | obj-$(CONFIG_SERIAL_MAX3100) += max3100.o |
| 49 | obj-$(CONFIG_SERIAL_IP22_ZILOG) += ip22zilog.o | 50 | obj-$(CONFIG_SERIAL_IP22_ZILOG) += ip22zilog.o |
| 50 | obj-$(CONFIG_SERIAL_MUX) += mux.o | 51 | obj-$(CONFIG_SERIAL_MUX) += mux.o |
| @@ -81,3 +82,4 @@ obj-$(CONFIG_SERIAL_KS8695) += serial_ks8695.o | |||
| 81 | obj-$(CONFIG_KGDB_SERIAL_CONSOLE) += kgdboc.o | 82 | obj-$(CONFIG_KGDB_SERIAL_CONSOLE) += kgdboc.o |
| 82 | obj-$(CONFIG_SERIAL_QE) += ucc_uart.o | 83 | obj-$(CONFIG_SERIAL_QE) += ucc_uart.o |
| 83 | obj-$(CONFIG_SERIAL_TIMBERDALE) += timbuart.o | 84 | obj-$(CONFIG_SERIAL_TIMBERDALE) += timbuart.o |
| 85 | obj-$(CONFIG_SERIAL_GRLIB_GAISLER_APBUART) += apbuart.o | ||