diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-12-06 09:23:35 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-06 09:23:35 -0500 |
| commit | 3642a0a2c7d2d1949988d0fd004a8039c1f3d02f (patch) | |
| tree | e687c88b1b66ad51a6a6c529f7f328f2d3b625fa /arch/powerpc/platforms/85xx/Kconfig | |
| parent | 58a273745fbb2fbd01d26e7a60f0acc8c1d99469 (diff) | |
| parent | b07fed455c883f07f8e847f5b0d79975b4dc8e7a (diff) | |
Merge branch 'mxs/saif' into next/drivers
Conflicts:
drivers/net/ethernet/cadence/Kconfig
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 |