projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-3.5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
sparc
/
kernel
/
Makefile
diff --git
a/arch/sparc/kernel/Makefile
b/arch/sparc/kernel/Makefile
index 72308f9b0096e45b6da24fef022a261989d5eacf..6cf591b7e1c67e2b82c4e28bf177197ce0f602a7 100644
(file)
--- a/
arch/sparc/kernel/Makefile
+++ b/
arch/sparc/kernel/Makefile
@@
-51,8
+51,8
@@
obj-y += of_device_common.o
obj-y += of_device_$(BITS).o
obj-$(CONFIG_SPARC64) += prom_irqtrans.o
obj-y += of_device_$(BITS).o
obj-$(CONFIG_SPARC64) += prom_irqtrans.o
-obj-$(CONFIG_SPARC
_LEON)
+= leon_kernel.o
-obj-$(CONFIG_SPARC
_LEON)
+= leon_pmc.o
+obj-$(CONFIG_SPARC
32)
+= leon_kernel.o
+obj-$(CONFIG_SPARC
32)
+= leon_pmc.o
obj-$(CONFIG_SPARC64) += reboot.o
obj-$(CONFIG_SPARC64) += sysfs.o
obj-$(CONFIG_SPARC64) += reboot.o
obj-$(CONFIG_SPARC64) += sysfs.o