diff options
| author | David S. Miller <davem@davemloft.net> | 2009-05-19 00:08:20 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-19 00:08:20 -0400 |
| commit | bb803cfbecb03a0cf8dc7e1864f18dda6631af00 (patch) | |
| tree | 6c0989693bea6f50cfa5c6bb14f52ec19668def3 /arch/powerpc/Kconfig | |
| parent | 3878fb6fdbceecca20b15748f807340854220f06 (diff) | |
| parent | 511e11e396dc596825ce04d53d7f6d579404bc01 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/scsi/fcoe/fcoe.c
Diffstat (limited to 'arch/powerpc/Kconfig')
| -rw-r--r-- | arch/powerpc/Kconfig | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 5b50e1ac6179..a0d1146a0578 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
| @@ -181,6 +181,10 @@ config SYS_SUPPORTS_APM_EMULATION | |||
| 181 | default y if PMAC_APM_EMU | 181 | default y if PMAC_APM_EMU |
| 182 | bool | 182 | bool |
| 183 | 183 | ||
| 184 | config DTC | ||
| 185 | bool | ||
| 186 | default y | ||
| 187 | |||
| 184 | config DEFAULT_UIMAGE | 188 | config DEFAULT_UIMAGE |
| 185 | bool | 189 | bool |
| 186 | help | 190 | help |
| @@ -462,7 +466,7 @@ config PPC_64K_PAGES | |||
| 462 | 466 | ||
| 463 | config PPC_256K_PAGES | 467 | config PPC_256K_PAGES |
| 464 | bool "256k page size" if 44x | 468 | bool "256k page size" if 44x |
| 465 | depends on !STDBINUTILS && (!SHMEM || BROKEN) | 469 | depends on !STDBINUTILS |
| 466 | help | 470 | help |
| 467 | Make the page size 256k. | 471 | Make the page size 256k. |
| 468 | 472 | ||