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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[pandora-kernel.git]
/
arch
/
parisc
/
Kconfig
diff --git
a/arch/parisc/Kconfig
b/arch/parisc/Kconfig
index
3d73545
..
b8ef178
100644
(file)
--- a/
arch/parisc/Kconfig
+++ b/
arch/parisc/Kconfig
@@
-267,7
+267,7
@@
source "drivers/Kconfig"
source "fs/Kconfig"
-source "
arch/parisc/oprofile/Kconfig
"
+source "
kernel/Kconfig.instrumentation
"
source "arch/parisc/Kconfig.debug"