diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-14 21:22:33 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-14 21:22:33 -0800 |
commit | b9e222904ce92e1b277f2b85411d1eb6bfe27410 (patch) | |
tree | 9458158ea70e6025723c53afc64ed61d044580b8 /arch/powerpc/platforms/52xx/Kconfig | |
parent | 4a0962abd187df29b7d1378b2f372a55667d54c0 (diff) | |
parent | d4eac7501f737c70420f38e9fd59de77a4ba6c13 (diff) | |
download | kernel_samsung_tuna-b9e222904ce92e1b277f2b85411d1eb6bfe27410.zip kernel_samsung_tuna-b9e222904ce92e1b277f2b85411d1eb6bfe27410.tar.gz kernel_samsung_tuna-b9e222904ce92e1b277f2b85411d1eb6bfe27410.tar.bz2 |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Remove unused CONFIG_WANT_DEVICE_TREE
[POWERPC] Cell RAS: Remove DEBUG, and add license and copyright
[POWERPC] hvc_rtas_init() must be __init
[POWERPC] free_property() must not be __init
[POWERPC] vdso_do_func_patch{32,64}() must be __init
[POWERPC] Remove generated files on make clean
[POWERPC] Fix arch/ppc compilation - add typedef for pgtable_t
[POWERPC] Wire up new timerfd syscalls
[POWERPC] PS3: Update sys-manager button events
[POWERPC] PS3: Sys-manager code cleanup
[POWERPC] PS3: Use system reboot on restart
[POWERPC] PS3: Fix bootwrapper hang bug
[POWERPC] PS3: Fix reading pm interval in logical performance monitor
[POWERPC] PS3: Fix setting bookmark in logical performance monitor
[POWERPC] Fix DEBUG_PREEMPT warning when warning
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 515f244..cf945d5 100644 --- a/arch/powerpc/platforms/52xx/Kconfig +++ b/arch/powerpc/platforms/52xx/Kconfig @@ -8,7 +8,6 @@ config PPC_MPC5200_SIMPLE bool "Generic support for simple MPC5200 based boards" depends on PPC_MPC52xx select DEFAULT_UIMAGE - select WANT_DEVICE_TREE help This option enables support for a simple MPC52xx based boards which do not need a custom platform specific setup. Such boards are @@ -35,7 +34,6 @@ config PPC_LITE5200 bool "Freescale Lite5200 Eval Board" depends on PPC_MPC52xx select DEFAULT_UIMAGE - select WANT_DEVICE_TREE config PPC_MPC5200_BUGFIX bool "MPC5200 (L25R) bugfix support" |