diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-10-04 01:20:34 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-10-04 01:20:34 -0400 |
| commit | 5a3e3b2230980cf2ce6e5e56b816dde19b993939 (patch) | |
| tree | a3c344211e30c7e0c601b53bef6473069c08ac8a /arch/powerpc/Kconfig | |
| parent | c730f5b621afa33e9f4939da9078669162ebff4e (diff) | |
| parent | 91bd61099defb28a442db358dd9c1693c6589cee (diff) | |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/vitb/linux-2.6-PQ
Diffstat (limited to 'arch/powerpc/Kconfig')
| -rw-r--r-- | arch/powerpc/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 5342f3fdb083..b29adaa97348 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
| @@ -594,6 +594,7 @@ endmenu | |||
| 594 | 594 | ||
| 595 | source arch/powerpc/platforms/embedded6xx/Kconfig | 595 | source arch/powerpc/platforms/embedded6xx/Kconfig |
| 596 | source arch/powerpc/platforms/4xx/Kconfig | 596 | source arch/powerpc/platforms/4xx/Kconfig |
| 597 | source arch/powerpc/platforms/82xx/Kconfig | ||
| 597 | source arch/powerpc/platforms/83xx/Kconfig | 598 | source arch/powerpc/platforms/83xx/Kconfig |
| 598 | source arch/powerpc/platforms/85xx/Kconfig | 599 | source arch/powerpc/platforms/85xx/Kconfig |
| 599 | source arch/powerpc/platforms/86xx/Kconfig | 600 | source arch/powerpc/platforms/86xx/Kconfig |