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 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
arch
/
avr32
/
configs
/
favr-32_defconfig
diff --git
a/arch/avr32/configs/favr-32_defconfig
b/arch/avr32/configs/favr-32_defconfig
index
0c813b6
..
aeadc95
100644
(file)
--- a/
arch/avr32/configs/favr-32_defconfig
+++ b/
arch/avr32/configs/favr-32_defconfig
@@
-11,7
+11,7
@@
CONFIG_BLK_DEV_INITRD=y
# CONFIG_COMPAT_BRK is not set
CONFIG_PROFILING=y
CONFIG_OPROFILE=m
-CONFIG_KPROBES=y
+# CONFIG_KPROBES is not set
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
# CONFIG_BLK_DEV_BSG is not set