diff options
| author | Anton Vorontsov <avorontsov@mvista.com> | 2010-04-16 15:07:24 -0400 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2010-04-20 00:12:21 -0400 |
| commit | e0f278adc29e8986531a51e5ed33db42e34bf952 (patch) | |
| tree | bdf1e6855dc92aa37e0094adfe3a2a0bad71a4d8 /arch/powerpc | |
| parent | 01bf0b64579ead8a82e7cfc32ae44bc667e7ad0f (diff) | |
powerpc/85xx/86xx: Fix build w/ CONFIG_PCI=n
Currently some MPC85xx and MPC86xx boards fail to build without
CONFIG_PCI:
arch/powerpc/platforms/fsl_uli1575.c: In function 'quirk_final_uli5249':
arch/powerpc/platforms/fsl_uli1575.c:234: error: implicit declaration of function 'pci_bus_for_each_resource'
arch/powerpc/platforms/fsl_uli1575.c:234: error: expected ';' before '{' token
cc1: warnings being treated as errors
arch/powerpc/platforms/fsl_uli1575.c:223: warning: unused variable 'dummy'
make[1]: *** [arch/powerpc/platforms/fsl_uli1575.o] Error 1
This patch fixes the issue by appending 'if PCI' condition when
selecting FSL_ULI1575 Kconfig symbol.
Signed-off-by: Anton Vorontsov <avorontsov@mvista.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/platforms/85xx/Kconfig | 4 | ||||
| -rw-r--r-- | arch/powerpc/platforms/86xx/Kconfig | 4 |
2 files changed, 4 insertions, 4 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 |
diff --git a/arch/powerpc/platforms/86xx/Kconfig b/arch/powerpc/platforms/86xx/Kconfig index fbe9f3621424..a0b5638c5dc8 100644 --- a/arch/powerpc/platforms/86xx/Kconfig +++ b/arch/powerpc/platforms/86xx/Kconfig | |||
| @@ -13,7 +13,7 @@ config MPC8641_HPCN | |||
| 13 | bool "Freescale MPC8641 HPCN" | 13 | bool "Freescale MPC8641 HPCN" |
| 14 | select PPC_I8259 | 14 | select PPC_I8259 |
| 15 | select DEFAULT_UIMAGE | 15 | select DEFAULT_UIMAGE |
| 16 | select FSL_ULI1575 | 16 | select FSL_ULI1575 if PCI |
| 17 | select HAS_RAPIDIO | 17 | select HAS_RAPIDIO |
| 18 | select SWIOTLB | 18 | select SWIOTLB |
| 19 | help | 19 | help |
| @@ -28,7 +28,7 @@ config SBC8641D | |||
| 28 | config MPC8610_HPCD | 28 | config MPC8610_HPCD |
| 29 | bool "Freescale MPC8610 HPCD" | 29 | bool "Freescale MPC8610 HPCD" |
| 30 | select DEFAULT_UIMAGE | 30 | select DEFAULT_UIMAGE |
| 31 | select FSL_ULI1575 | 31 | select FSL_ULI1575 if PCI |
| 32 | help | 32 | help |
| 33 | This option enables support for the MPC8610 HPCD board. | 33 | This option enables support for the MPC8610 HPCD board. |
| 34 | 34 | ||