diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-02-18 16:33:07 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-03-21 18:26:03 +0100 |
| commit | 1ced9a5b07ccf41704ca347778a154944598c665 (patch) | |
| tree | c4970ab9a38c069ce456e0b51a8f2b90b7739a22 | |
| parent | 847e34969d9e51d7f931fc37867adc140c03a61a (diff) | |
| download | linux-next-1ced9a5b07ccf41704ca347778a154944598c665.tar.gz | |
ARM: pxa: fix pxa_ssp_* declarations
The functions declared in include/linux/pxa2xx_ssp.h are
defined in plat-pxa/ssp.c, which can also be built for
PLAT_MMP, but may be disabled there. This can lead to
both unresolved symbols at link time and to duplicate
symbols at compile time for random configurations.
Changing the #ifdef in the header file to match the
Kconfig symbol that decides if the file is built solves
both problems.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Eric Miao <eric.y.miao@gmail.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
Cc: Daniel Mack <zonque@gmail.com>
| -rw-r--r-- | include/linux/pxa2xx_ssp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/pxa2xx_ssp.h b/include/linux/pxa2xx_ssp.h index 49444203328a..f2b405116166 100644 --- a/include/linux/pxa2xx_ssp.h +++ b/include/linux/pxa2xx_ssp.h @@ -219,7 +219,7 @@ static inline u32 pxa_ssp_read_reg(struct ssp_device *dev, u32 reg) return __raw_readl(dev->mmio_base + reg); } -#ifdef CONFIG_ARCH_PXA +#if IS_ENABLED(CONFIG_PXA_SSP) struct ssp_device *pxa_ssp_request(int port, const char *label); void pxa_ssp_free(struct ssp_device *); struct ssp_device *pxa_ssp_request_of(const struct device_node *of_node, |