git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next
[safe/jmp/linux-2.6]
/
arch
/
sparc
/
kernel
/
Makefile
diff --git
a/arch/sparc/kernel/Makefile
b/arch/sparc/kernel/Makefile
index
96aad39
..
5b47fab
100644
(file)
--- a/
arch/sparc/kernel/Makefile
+++ b/
arch/sparc/kernel/Makefile
@@
-108,5
+108,5
@@
obj-$(CONFIG_AUDIT) += audit.o
audit--$(CONFIG_AUDIT) := compat_audit.o
obj-$(CONFIG_COMPAT) += $(audit--y)
-pc--$(CONFIG_PERF_
COUNTERS) := perf_counter
.o
+pc--$(CONFIG_PERF_
EVENTS) := perf_event
.o
obj-$(CONFIG_SPARC64) += $(pc--y)