diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-25 14:08:17 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-25 14:08:17 -0400 |
| commit | 5047887caf1806f31652210df27fb62a7c43f27d (patch) | |
| tree | 4098ead40c1aa7b904167f67cff87a247cfa0b6c /arch/powerpc/platforms/52xx/Kconfig | |
| parent | 996abf053eec4d67136be8b911bbaaf989cfb99c (diff) | |
| parent | 973b7d83ebeb1e34b8bee69208916e5f0e2353c3 (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (34 commits)
powerpc: Wireup new syscalls
Move update_mmu_cache() declaration from tlbflush.h to pgtable.h
powerpc/pseries: Remove kmalloc call in handling writes to lparcfg
powerpc/pseries: Update arch vector to indicate support for CMO
ibmvfc: Add support for collaborative memory overcommit
ibmvscsi: driver enablement for CMO
ibmveth: enable driver for CMO
ibmveth: Automatically enable larger rx buffer pools for larger mtu
powerpc/pseries: Verify CMO memory entitlement updates with virtual I/O
powerpc/pseries: vio bus support for CMO
powerpc/pseries: iommu enablement for CMO
powerpc/pseries: Add CMO paging statistics
powerpc/pseries: Add collaborative memory manager
powerpc/pseries: Utilities to set firmware page state
powerpc/pseries: Enable CMO feature during platform setup
powerpc/pseries: Split retrieval of processor entitlement data into a helper routine
powerpc/pseries: Add memory entitlement capabilities to /proc/ppc64/lparcfg
powerpc/pseries: Split processor entitlement retrieval and gathering to helper routines
powerpc/pseries: Remove extraneous error reporting for hcall failures in lparcfg
powerpc: Fix compile error with binutils 2.15
...
Fixed up conflict in arch/powerpc/platforms/52xx/Kconfig manually.
Diffstat (limited to 'arch/powerpc/platforms/52xx/Kconfig')
| -rw-r--r-- | arch/powerpc/platforms/52xx/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/52xx/Kconfig b/arch/powerpc/platforms/52xx/Kconfig index ccbd4958412e..696a5ee4962d 100644 --- a/arch/powerpc/platforms/52xx/Kconfig +++ b/arch/powerpc/platforms/52xx/Kconfig | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | config PPC_MPC52xx | 1 | config PPC_MPC52xx |
| 2 | bool "52xx-based boards" | 2 | bool "52xx-based boards" |
| 3 | depends on PPC_MULTIPLATFORM && PPC32 | 3 | depends on PPC_MULTIPLATFORM && PPC32 |
| 4 | select FSL_SOC | ||
| 5 | select PPC_CLOCK | 4 | select PPC_CLOCK |
| 6 | select PPC_PCI_CHOICE | 5 | select PPC_PCI_CHOICE |
| 7 | 6 | ||
| @@ -49,5 +48,6 @@ config PPC_MPC5200_GPIO | |||
| 49 | bool "MPC5200 GPIO support" | 48 | bool "MPC5200 GPIO support" |
| 50 | depends on PPC_MPC52xx | 49 | depends on PPC_MPC52xx |
| 51 | select ARCH_REQUIRE_GPIOLIB | 50 | select ARCH_REQUIRE_GPIOLIB |
| 51 | select GENERIC_GPIO | ||
| 52 | help | 52 | help |
| 53 | Enable gpiolib support for mpc5200 based boards | 53 | Enable gpiolib support for mpc5200 based boards |