projects
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into x86/urgent
[linux-2.6]
/
arch
/
arm
/
configs
/
orion5x_defconfig
diff --git
a/arch/arm/configs/orion5x_defconfig
b/arch/arm/configs/orion5x_defconfig
index
5b98f76
..
9e23852
100644
(file)
--- a/
arch/arm/configs/orion5x_defconfig
+++ b/
arch/arm/configs/orion5x_defconfig
@@
-903,7
+903,8
@@
CONFIG_UNIX98_PTYS=y
CONFIG_LEGACY_PTYS=y
CONFIG_LEGACY_PTY_COUNT=16
# CONFIG_IPMI_HANDLER is not set
-# CONFIG_HW_RANDOM is not set
+CONFIG_HW_RANDOM=m
+CONFIG_HW_RANDOM_TIMERIOMEM=m
# CONFIG_R3964 is not set
# CONFIG_APPLICOM is not set
# CONFIG_RAW_DRIVER is not set