projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v3.14.25' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
arch
/
sh
/
kernel
/
Makefile
diff --git
a/arch/sh/kernel/Makefile
b/arch/sh/kernel/Makefile
index
261c8bf
..
2ccf36c
100644
(file)
--- a/
arch/sh/kernel/Makefile
+++ b/
arch/sh/kernel/Makefile
@@
-22,7
+22,7
@@
obj-y := debugtraps.o dma-nommu.o dumpstack.o \
ifndef CONFIG_GENERIC_IOMAP
obj-y += iomap.o
-obj-$(CONFIG_HAS_IOPORT
)
+= ioport.o
+obj-$(CONFIG_HAS_IOPORT
_MAP)
+= ioport.o
endif
obj-$(CONFIG_SUPERH32) += sys_sh32.o