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 git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
[pandora-kernel.git]
/
arch
/
frv
/
Kconfig
diff --git
a/arch/frv/Kconfig
b/arch/frv/Kconfig
index
b86e19c
..
4b5830b
100644
(file)
--- a/
arch/frv/Kconfig
+++ b/
arch/frv/Kconfig
@@
-7,7
+7,7
@@
config FRV
default y
select HAVE_IDE
select HAVE_ARCH_TRACEHOOK
- select HAVE_PERF_
COUNTER
S
+ select HAVE_PERF_
EVENT
S
config ZONE_DMA
bool