diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2010-03-12 17:13:25 -0800 |
|---|---|---|
| committer | Leann Ogasawara <leann.ogasawara@canonical.com> | 2012-06-18 07:00:44 -0700 |
| commit | 416c4af3d30d029d5d5909118d3858163d59d9a0 (patch) | |
| tree | b9a24b618a0ea80a5795a316973a7e9d89718d76 /arch | |
| parent | 485802a6c524e62b5924849dd727ddbb1497cc71 (diff) | |
UBUNTU: (no-up) fold down debian for ubuntu-q v3.5-rc1 rebase
Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/Kconfig | 2 | ||||
| -rw-r--r-- | arch/powerpc/Kconfig | 2 | ||||
| -rw-r--r-- | arch/x86/Kconfig | 8 |
3 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 84449dd8f03..399b961e9e6 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -2263,6 +2263,8 @@ source "net/Kconfig" source "drivers/Kconfig" +source "ubuntu/Kconfig" + source "fs/Kconfig" source "arch/arm/Kconfig.debug" diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 050cb371a69..a9363d28dbb 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -986,6 +986,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 c70684f859e..8e083c36f51 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -381,6 +381,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 @@ -2220,6 +2226,8 @@ source "net/Kconfig" source "drivers/Kconfig" +source "ubuntu/Kconfig" + source "drivers/firmware/Kconfig" source "fs/Kconfig" |