diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2010-03-12 17:13:25 -0800 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-11-16 14:21:38 -0700 |
| commit | 2e72f8265abd06794b51e5302bf1902072d046b5 (patch) | |
| tree | cd639a5e29c58ad435a26a42e6a2d2b09a7f5f48 /arch | |
| parent | f6b252b6b92671d2633008408c06d35c26e55ecf (diff) | |
UBUNTU: (no-up) fold down debian for ubuntu-oneiric v3.1-rc1 rebase
Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/Kconfig | 2 | ||||
| -rw-r--r-- | arch/x86/Kconfig | 8 |
2 files changed, 10 insertions, 0 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 6926b61acfe..9d8340904cf 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -973,6 +973,8 @@ source "net/Kconfig" source "drivers/Kconfig" +source "ubuntu/Kconfig" + source "fs/Kconfig" source "arch/powerpc/sysdev/qe_lib/Kconfig" diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 6a47bb22657..1acfdf35305 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -377,6 +377,12 @@ config X86_UV # Following is an alphabetically sorted list of 32 bit extended platforms # Please maintain the alphabetic order if and when there are additions +config X86_LPIA + bool "LPIA-compatible" + depends on X86_32 && X86_PC + help + Choose this option if your computer is an LPIA platform. + config X86_INTEL_CE bool "CE4100 TV platform" depends on PCI @@ -2138,6 +2144,8 @@ source "net/Kconfig" source "drivers/Kconfig" +source "ubuntu/Kconfig" + source "drivers/firmware/Kconfig" source "fs/Kconfig" |