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 branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
configs
/
integrator_defconfig
diff --git
a/arch/arm/configs/integrator_defconfig
b/arch/arm/configs/integrator_defconfig
index 869faae67201a448492ab768d3c9fd91a4aefc89..69cb8f1efcea8e448a89a66b64af79ad2e81d69a 100644
(file)
--- a/
arch/arm/configs/integrator_defconfig
+++ b/
arch/arm/configs/integrator_defconfig
@@
-26,6
+26,7
@@
CONFIG_CPU_FREQ=y
CONFIG_CPU_FREQ_GOV_POWERSAVE=y
CONFIG_CPU_FREQ_GOV_USERSPACE=y
CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPUFREQ_DT=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y