diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-07-10 23:28:26 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-07-10 23:28:26 -0400 |
| commit | bf22f6fe2d72b4d7e9035be8ceb340414cf490e3 (patch) | |
| tree | 14085d90de0428316479fe6de8a0c6d32e6e65e2 /arch/powerpc/configs/holly_defconfig | |
| parent | 4eb6bf6bfb580afaf1e1a1d30cba17a078530cf4 (diff) | |
| parent | 93ab471889c6662b42ce7da257f31f24c08d7d9e (diff) | |
Merge branch 'for-2.6.23' into merge
Diffstat (limited to 'arch/powerpc/configs/holly_defconfig')
| -rw-r--r-- | arch/powerpc/configs/holly_defconfig | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/powerpc/configs/holly_defconfig b/arch/powerpc/configs/holly_defconfig index 32781849ad4c..04b94f884aae 100644 --- a/arch/powerpc/configs/holly_defconfig +++ b/arch/powerpc/configs/holly_defconfig | |||
| @@ -190,10 +190,12 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 | |||
| 190 | # CONFIG_RESOURCES_64BIT is not set | 190 | # CONFIG_RESOURCES_64BIT is not set |
| 191 | CONFIG_ZONE_DMA_FLAG=1 | 191 | CONFIG_ZONE_DMA_FLAG=1 |
| 192 | CONFIG_PROC_DEVICETREE=y | 192 | CONFIG_PROC_DEVICETREE=y |
| 193 | # CONFIG_CMDLINE_BOOL is not set | 193 | CONFIG_CMDLINE_BOOL=y |
| 194 | CONFIG_CMDLINE="console=ttyS0,115200" | ||
| 194 | # CONFIG_PM is not set | 195 | # CONFIG_PM is not set |
| 195 | # CONFIG_SECCOMP is not set | 196 | # CONFIG_SECCOMP is not set |
| 196 | # CONFIG_WANT_DEVICE_TREE is not set | 197 | CONFIG_WANT_DEVICE_TREE=y |
| 198 | CONFIG_DEVICE_TREE="holly.dts" | ||
| 197 | CONFIG_ISA_DMA_API=y | 199 | CONFIG_ISA_DMA_API=y |
| 198 | 200 | ||
| 199 | # | 201 | # |