diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-21 18:50:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-21 18:50:49 -0400 |
| commit | 9a64388d83f6ef08dfff405a9d122e3dbcb6bf38 (patch) | |
| tree | a77532ce4d6d56be6c6c7f405cd901a0184250fb /arch/powerpc/platforms/82xx | |
| parent | e80ab411e589e00550e2e6e5a6a02d59cc730357 (diff) | |
| parent | 14b3ca4022f050f8622ed282b734ddf445464583 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (202 commits)
[POWERPC] Fix compile breakage for 64-bit UP configs
[POWERPC] Define copy_siginfo_from_user32
[POWERPC] Add compat handler for PTRACE_GETSIGINFO
[POWERPC] i2c: Fix build breakage introduced by OF helpers
[POWERPC] Optimize fls64() on 64-bit processors
[POWERPC] irqtrace support for 64-bit powerpc
[POWERPC] Stacktrace support for lockdep
[POWERPC] Move stackframe definitions to common header
[POWERPC] Fix device-tree locking vs. interrupts
[POWERPC] Make pci_bus_to_host()'s struct pci_bus * argument const
[POWERPC] Remove unused __max_memory variable
[POWERPC] Simplify xics direct/lpar irq_host setup
[POWERPC] Use pseries_setup_i8259_cascade() in pseries_mpic_init_IRQ()
[POWERPC] Turn xics_setup_8259_cascade() into a generic pseries_setup_i8259_cascade()
[POWERPC] Move xics_setup_8259_cascade() into platforms/pseries/setup.c
[POWERPC] Use asm-generic/bitops/find.h in bitops.h
[POWERPC] 83xx: mpc8315 - fix USB UTMI Host setup
[POWERPC] 85xx: Fix the size of qe muram for MPC8568E
[POWERPC] 86xx: mpc86xx_hpcn - Temporarily accept old dts node identifier.
[POWERPC] 86xx: mark functions static, other minor cleanups
...
Diffstat (limited to 'arch/powerpc/platforms/82xx')
| -rw-r--r-- | arch/powerpc/platforms/82xx/Kconfig | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/82xx/Kconfig b/arch/powerpc/platforms/82xx/Kconfig index 4fad6c7bf9f1..917ac8891555 100644 --- a/arch/powerpc/platforms/82xx/Kconfig +++ b/arch/powerpc/platforms/82xx/Kconfig | |||
| @@ -11,7 +11,6 @@ config MPC8272_ADS | |||
| 11 | select 8260 | 11 | select 8260 |
| 12 | select FSL_SOC | 12 | select FSL_SOC |
| 13 | select PQ2_ADS_PCI_PIC if PCI | 13 | select PQ2_ADS_PCI_PIC if PCI |
| 14 | select PPC_CPM_NEW_BINDING | ||
| 15 | help | 14 | help |
| 16 | This option enables support for the MPC8272 ADS board | 15 | This option enables support for the MPC8272 ADS board |
| 17 | 16 | ||
| @@ -22,7 +21,6 @@ config PQ2FADS | |||
| 22 | select 8260 | 21 | select 8260 |
| 23 | select FSL_SOC | 22 | select FSL_SOC |
| 24 | select PQ2_ADS_PCI_PIC if PCI | 23 | select PQ2_ADS_PCI_PIC if PCI |
| 25 | select PPC_CPM_NEW_BINDING | ||
| 26 | help | 24 | help |
| 27 | This option enables support for the PQ2FADS board | 25 | This option enables support for the PQ2FADS board |
| 28 | 26 | ||
| @@ -31,7 +29,6 @@ config EP8248E | |||
| 31 | select 8272 | 29 | select 8272 |
| 32 | select 8260 | 30 | select 8260 |
| 33 | select FSL_SOC | 31 | select FSL_SOC |
| 34 | select PPC_CPM_NEW_BINDING | ||
| 35 | select MDIO_BITBANG | 32 | select MDIO_BITBANG |
| 36 | help | 33 | help |
| 37 | This enables support for the Embedded Planet EP8248E board. | 34 | This enables support for the Embedded Planet EP8248E board. |