diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-12 03:05:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-12 03:05:35 -0400 |
| commit | 278554bd6579206921f5d8a523649a7a57f8850d (patch) | |
| tree | 4e6c527daf0910e455b3aa72e2c96b0479e430be /arch/powerpc/platforms/85xx/Kconfig | |
| parent | 5a147e8bf982f9dd414c1dd751fe02c1942506b2 (diff) | |
| parent | cea0d767c29669bf89f86e4aee46ef462d2ebae8 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wireless/ath/ar9170/usb.c
drivers/scsi/iscsi_tcp.c
net/ipv4/ipmr.c
Diffstat (limited to 'arch/powerpc/platforms/85xx/Kconfig')
| -rw-r--r-- | arch/powerpc/platforms/85xx/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig index d95121894eb7..3a2ade2e443f 100644 --- a/arch/powerpc/platforms/85xx/Kconfig +++ b/arch/powerpc/platforms/85xx/Kconfig | |||
| @@ -51,7 +51,7 @@ config MPC85xx_DS | |||
| 51 | bool "Freescale MPC85xx DS" | 51 | bool "Freescale MPC85xx DS" |
| 52 | select PPC_I8259 | 52 | select PPC_I8259 |
| 53 | select DEFAULT_UIMAGE | 53 | select DEFAULT_UIMAGE |
| 54 | select FSL_ULI1575 | 54 | select FSL_ULI1575 if PCI |
| 55 | select SWIOTLB | 55 | select SWIOTLB |
| 56 | help | 56 | help |
| 57 | This option enables support for the MPC85xx DS (MPC8544 DS) board | 57 | This option enables support for the MPC85xx DS (MPC8544 DS) board |
| @@ -60,7 +60,7 @@ config MPC85xx_RDB | |||
| 60 | bool "Freescale MPC85xx RDB" | 60 | bool "Freescale MPC85xx RDB" |
| 61 | select PPC_I8259 | 61 | select PPC_I8259 |
| 62 | select DEFAULT_UIMAGE | 62 | select DEFAULT_UIMAGE |
| 63 | select FSL_ULI1575 | 63 | select FSL_ULI1575 if PCI |
| 64 | select SWIOTLB | 64 | select SWIOTLB |
| 65 | help | 65 | help |
| 66 | This option enables support for the MPC85xx RDB (P2020 RDB) board | 66 | This option enables support for the MPC85xx RDB (P2020 RDB) board |