diff options
| author | David S. Miller <davem@davemloft.net> | 2008-02-23 23:38:20 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-23 23:38:20 -0500 |
| commit | 8d3c202be23c5a915f7053ebd4e96f44700c6a62 (patch) | |
| tree | e0f017aff86d3ad0b858fe85f44e11096087ed00 /arch/powerpc/platforms/52xx/Kconfig | |
| parent | 1b04ab4597725f75f94942da9aa40daa7b9a4bd9 (diff) | |
| parent | 038eb0ea04b245351be34b0ae76b55eee4603989 (diff) | |
Merge branch 'master' of ../linux-2.6/
Diffstat (limited to 'arch/powerpc/platforms/52xx/Kconfig')
| -rw-r--r-- | arch/powerpc/platforms/52xx/Kconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/52xx/Kconfig b/arch/powerpc/platforms/52xx/Kconfig index 515f244c90bb..cf945d55c276 100644 --- a/arch/powerpc/platforms/52xx/Kconfig +++ b/arch/powerpc/platforms/52xx/Kconfig | |||
| @@ -8,7 +8,6 @@ config PPC_MPC5200_SIMPLE | |||
| 8 | bool "Generic support for simple MPC5200 based boards" | 8 | bool "Generic support for simple MPC5200 based boards" |
| 9 | depends on PPC_MPC52xx | 9 | depends on PPC_MPC52xx |
| 10 | select DEFAULT_UIMAGE | 10 | select DEFAULT_UIMAGE |
| 11 | select WANT_DEVICE_TREE | ||
| 12 | help | 11 | help |
| 13 | This option enables support for a simple MPC52xx based boards which | 12 | This option enables support for a simple MPC52xx based boards which |
| 14 | do not need a custom platform specific setup. Such boards are | 13 | do not need a custom platform specific setup. Such boards are |
| @@ -35,7 +34,6 @@ config PPC_LITE5200 | |||
| 35 | bool "Freescale Lite5200 Eval Board" | 34 | bool "Freescale Lite5200 Eval Board" |
| 36 | depends on PPC_MPC52xx | 35 | depends on PPC_MPC52xx |
| 37 | select DEFAULT_UIMAGE | 36 | select DEFAULT_UIMAGE |
| 38 | select WANT_DEVICE_TREE | ||
| 39 | 37 | ||
| 40 | config PPC_MPC5200_BUGFIX | 38 | config PPC_MPC5200_BUGFIX |
| 41 | bool "MPC5200 (L25R) bugfix support" | 39 | bool "MPC5200 (L25R) bugfix support" |