diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-12-20 09:43:53 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-12-20 09:43:53 -0500 |
| commit | 1fbe6f625f69e48c4001051dc1431afc704acfaa (patch) | |
| tree | 826b741201a2e09a627ed350c6ff36935f5cff79 /arch/powerpc/platforms/85xx/Kconfig | |
| parent | 0cecdd818cd79d092e36e70dfe3a71f2878d6b96 (diff) | |
| parent | 384703b8e6cd4c8ef08512e596024e028c91c339 (diff) | |
Merge tag 'v3.2-rc6' of /home/airlied/devel/kernel/linux-2.6 into drm-core-next
Merge in the upstream tree to bring in the mainline fixes.
Conflicts:
drivers/gpu/drm/exynos/exynos_drm_fbdev.c
drivers/gpu/drm/nouveau/nouveau_sgdma.c
Diffstat (limited to 'arch/powerpc/platforms/85xx/Kconfig')
| -rw-r--r-- | arch/powerpc/platforms/85xx/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig index 45023e26aea3..d7946be298b6 100644 --- a/arch/powerpc/platforms/85xx/Kconfig +++ b/arch/powerpc/platforms/85xx/Kconfig | |||
| @@ -203,7 +203,7 @@ config P3060_QDS | |||
| 203 | select PPC_E500MC | 203 | select PPC_E500MC |
| 204 | select PHYS_64BIT | 204 | select PHYS_64BIT |
| 205 | select SWIOTLB | 205 | select SWIOTLB |
| 206 | select MPC8xxx_GPIO | 206 | select GPIO_MPC8XXX |
| 207 | select HAS_RAPIDIO | 207 | select HAS_RAPIDIO |
| 208 | select PPC_EPAPR_HV_PIC | 208 | select PPC_EPAPR_HV_PIC |
| 209 | help | 209 | help |