diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-02-23 04:32:42 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-02-23 04:40:45 -0500 |
| commit | c2a941fadb57d157d59eec424674bd0c3a28788c (patch) | |
| tree | 5869120dd9774b311580f187d7d4fdfbb3268744 | |
| parent | dc3119e700216a70e82fe07a79f1618852058354 (diff) | |
x86: OLPC: Remove extra OLPC_OPENFIRMWARE_DT indirection
OLPC_OPENFIRMWARE_DT is just there to be selected by OLPC and selects
OF_PROMTREE. So let OLPC select OF_PROMTREE and remove that extra
config indirection. Fixup code and Makefile and use CONFIG_OF_PROMTREE
instead.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Andres Salomon <dilinger@queued.net>
| -rw-r--r-- | arch/x86/Kconfig | 6 | ||||
| -rw-r--r-- | arch/x86/include/asm/olpc_ofw.h | 4 | ||||
| -rw-r--r-- | arch/x86/platform/olpc/Makefile | 2 |
3 files changed, 4 insertions, 8 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 677501d061a3..4f3d3d432bad 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
| @@ -2069,7 +2069,7 @@ config OLPC | |||
| 2069 | depends on !X86_PAE | 2069 | depends on !X86_PAE |
| 2070 | select GPIOLIB | 2070 | select GPIOLIB |
| 2071 | select OF | 2071 | select OF |
| 2072 | select OLPC_OPENFIRMWARE_DT if PROC_DEVICETREE | 2072 | select OF_PROMTREE if PROC_DEVICETREE |
| 2073 | ---help--- | 2073 | ---help--- |
| 2074 | Add support for detecting the unique features of the OLPC | 2074 | Add support for detecting the unique features of the OLPC |
| 2075 | XO hardware. | 2075 | XO hardware. |
| @@ -2080,10 +2080,6 @@ config OLPC_XO1 | |||
| 2080 | ---help--- | 2080 | ---help--- |
| 2081 | Add support for non-essential features of the OLPC XO-1 laptop. | 2081 | Add support for non-essential features of the OLPC XO-1 laptop. |
| 2082 | 2082 | ||
| 2083 | config OLPC_OPENFIRMWARE_DT | ||
| 2084 | bool | ||
| 2085 | select OF_PROMTREE | ||
| 2086 | |||
| 2087 | endif # X86_32 | 2083 | endif # X86_32 |
| 2088 | 2084 | ||
| 2089 | config AMD_NB | 2085 | config AMD_NB |
diff --git a/arch/x86/include/asm/olpc_ofw.h b/arch/x86/include/asm/olpc_ofw.h index 1fff2de124e5..28a7fec01100 100644 --- a/arch/x86/include/asm/olpc_ofw.h +++ b/arch/x86/include/asm/olpc_ofw.h | |||
| @@ -24,10 +24,10 @@ extern void setup_olpc_ofw_pgd(void); | |||
| 24 | /* check if OFW was detected during boot */ | 24 | /* check if OFW was detected during boot */ |
| 25 | extern bool olpc_ofw_present(void); | 25 | extern bool olpc_ofw_present(void); |
| 26 | 26 | ||
| 27 | #ifdef CONFIG_OLPC_OPENFIRMWARE_DT | 27 | #ifdef CONFIG_OF_PROMTREE |
| 28 | extern void olpc_dt_build_devicetree(void); | 28 | extern void olpc_dt_build_devicetree(void); |
| 29 | #else | 29 | #else |
| 30 | static inline void olpc_dt_build_devicetree(void) { } | 30 | static inline void olpc_dt_build_devicetree(void) { } |
| 31 | #endif /* CONFIG_OLPC_OPENFIRMWARE_DT */ | 31 | #endif |
| 32 | 32 | ||
| 33 | #endif /* _ASM_X86_OLPC_OFW_H */ | 33 | #endif /* _ASM_X86_OLPC_OFW_H */ |
diff --git a/arch/x86/platform/olpc/Makefile b/arch/x86/platform/olpc/Makefile index e18e641ae7bd..c2a8cab65e5d 100644 --- a/arch/x86/platform/olpc/Makefile +++ b/arch/x86/platform/olpc/Makefile | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | obj-$(CONFIG_OLPC) += olpc.o | 1 | obj-$(CONFIG_OLPC) += olpc.o |
| 2 | obj-$(CONFIG_OLPC_XO1) += olpc-xo1.o | 2 | obj-$(CONFIG_OLPC_XO1) += olpc-xo1.o |
| 3 | obj-$(CONFIG_OLPC) += olpc_ofw.o | 3 | obj-$(CONFIG_OLPC) += olpc_ofw.o |
| 4 | obj-$(CONFIG_OLPC_OPENFIRMWARE_DT) += olpc_dt.o | 4 | obj-$(CONFIG_OF_PROMTREE) += olpc_dt.o |