diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-01-23 23:29:14 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-01-23 23:29:14 -0500 |
| commit | dcb571be2019ae677bc5ed64437dbc87ae1eb67f (patch) | |
| tree | 1b93f9ea3568be4dcc49ffb2adc0d3ab0a02b47f /arch/powerpc/Kconfig | |
| parent | 9156ad48338e0306e508ead5c0d9986050744475 (diff) | |
| parent | 96f39c1718091d63dc1c5012d566737ea0d2a20c (diff) | |
Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into for-2.6.25
Diffstat (limited to 'arch/powerpc/Kconfig')
| -rw-r--r-- | arch/powerpc/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 53d0955abf11..9ae800d81f89 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
| @@ -140,6 +140,9 @@ config DEFAULT_UIMAGE | |||
| 140 | Used to allow a board to specify it wants a uImage built by default | 140 | Used to allow a board to specify it wants a uImage built by default |
| 141 | default n | 141 | default n |
| 142 | 142 | ||
| 143 | config REDBOOT | ||
| 144 | bool | ||
| 145 | |||
| 143 | config PPC64_SWSUSP | 146 | config PPC64_SWSUSP |
| 144 | bool | 147 | bool |
| 145 | depends on PPC64 && (BROKEN || (PPC_PMAC64 && EXPERIMENTAL)) | 148 | depends on PPC64 && (BROKEN || (PPC_PMAC64 && EXPERIMENTAL)) |