diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-13 15:15:43 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-13 15:15:43 -0400 |
| commit | 99ad25a313bda566a346b46a6015afa65bc0a02b (patch) | |
| tree | b9443fed1ab74f320c4ee0791864ee96d7c069df /arch/ppc64 | |
| parent | f62c4a96f74d6c6dd56d1742697e94a5c2085e87 (diff) | |
| parent | 9a556e89081b0c1c2f83cee915363b15a68a6f2d (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/ppc64')
| -rw-r--r-- | arch/ppc64/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/ppc64/Kconfig b/arch/ppc64/Kconfig index f804f25232ac..fdd8afba7152 100644 --- a/arch/ppc64/Kconfig +++ b/arch/ppc64/Kconfig | |||
| @@ -429,6 +429,8 @@ config CMDLINE | |||
| 429 | 429 | ||
| 430 | endmenu | 430 | endmenu |
| 431 | 431 | ||
| 432 | source "net/Kconfig" | ||
| 433 | |||
| 432 | source "drivers/Kconfig" | 434 | source "drivers/Kconfig" |
| 433 | 435 | ||
| 434 | source "fs/Kconfig" | 436 | source "fs/Kconfig" |