diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2010-03-12 17:13:25 -0800 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2012-06-25 12:16:51 -0600 |
| commit | a79c66b5b6231570d6233b1188ad0924e64d3f89 (patch) | |
| tree | 90a505fafcd5d36cdcb7b3d5ca7e4c12bddd3986 /arch | |
| parent | 76e10d158efb6d4516018846f60c2ab5501900bc (diff) | |
SAUCE only changes from 27df456 UBUNTU: (no-up) fold down debian for ubuntu-q v3.3-rc1 rebase
Signed-off-by: John Rigby <john.rigby@linaro.org>
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 36586dba6fa..9469ca1bae7 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -2295,6 +2295,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 feab3bad6d0..22a6e2f99ea 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -994,6 +994,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 c9866b0b77d..c8712ea749e 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -392,6 +392,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 @@ -2219,6 +2225,8 @@ source "net/Kconfig" source "drivers/Kconfig" +source "ubuntu/Kconfig" + source "drivers/firmware/Kconfig" source "fs/Kconfig" |