git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
arch
/
arm
/
mach-mxs
/
devices
/
Makefile
diff --git
a/arch/arm/mach-mxs/devices/Makefile
b/arch/arm/mach-mxs/devices/Makefile
index
4b5266a
..
d0a09f6
100644
(file)
--- a/
arch/arm/mach-mxs/devices/Makefile
+++ b/
arch/arm/mach-mxs/devices/Makefile
@@
-1,2
+1,2
@@
-obj-$(CONFIG_MXS_HAVE_
PLATFORM_DUART) += platform
-duart.o
+obj-$(CONFIG_MXS_HAVE_
AMBA_DUART) += amba
-duart.o
obj-$(CONFIG_MXS_HAVE_PLATFORM_FEC) += platform-fec.o