diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-07-11 05:28:26 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-07-11 05:28:26 +0200 |
| commit | bf22f6fe2d72b4d7e9035be8ceb340414cf490e3 (patch) | |
| tree | 14085d90de0428316479fe6de8a0c6d32e6e65e2 /arch/powerpc/configs/holly_defconfig | |
| parent | lots-of-architectures: enable arbitary speed tty support (diff) | |
| parent | [POWERPC] Create add_rtc() function to enable the RTC CMOS driver (diff) | |
| download | linux-bf22f6fe2d72b4d7e9035be8ceb340414cf490e3.tar.xz linux-bf22f6fe2d72b4d7e9035be8ceb340414cf490e3.zip | |
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 # CONFIG_RESOURCES_64BIT is not set CONFIG_ZONE_DMA_FLAG=1 CONFIG_PROC_DEVICETREE=y -# CONFIG_CMDLINE_BOOL is not set +CONFIG_CMDLINE_BOOL=y +CONFIG_CMDLINE="console=ttyS0,115200" # CONFIG_PM is not set # CONFIG_SECCOMP is not set -# CONFIG_WANT_DEVICE_TREE is not set +CONFIG_WANT_DEVICE_TREE=y +CONFIG_DEVICE_TREE="holly.dts" CONFIG_ISA_DMA_API=y # |