git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'torvalds/master' into perf/core
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
configs
/
x86_64_defconfig
diff --git
a/arch/x86/configs/x86_64_defconfig
b/arch/x86/configs/x86_64_defconfig
index 9936528e19393afad0f87a89196e43dd2c52e171..b60bd2d8603499a88dcf0bedb164154cb818c982 100644
(file)
--- a/
arch/x86/configs/x86_64_defconfig
+++ b/
arch/x86/configs/x86_64_defconfig
@@
-48,7
+48,6
@@
CONFIG_JUMP_LABEL=y
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
CONFIG_MODULE_FORCE_UNLOAD=y
-# CONFIG_UNUSED_SYMBOLS is not set
CONFIG_BINFMT_MISC=y
CONFIG_NET=y
CONFIG_PACKET=y