diff options
| author | Mark Brown <broonie@kernel.org> | 2019-03-04 15:32:51 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-03-04 15:32:51 +0000 |
| commit | 14dbfb417bd80c96ec700c7a8414bb6f5db7ecd2 (patch) | |
| tree | f79fb71b6206ef40aa34c52649053a2aaa493a3c /arch/mips | |
| parent | b50c6ac8b6fb3e7b5cf843afd789c8553a910254 (diff) | |
| parent | 0e836c3bea7da04cd4e2ed22d8c20654d5a09273 (diff) | |
Merge branch 'spi-5.1' into spi-next
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/ath79/dev-spi.h | 2 | ||||
| -rw-r--r-- | arch/mips/include/asm/mach-ath79/ath79_spi_platform.h | 19 |
2 files changed, 1 insertions, 20 deletions
diff --git a/arch/mips/ath79/dev-spi.h b/arch/mips/ath79/dev-spi.h index d732565ca736..6e15bc8651be 100644 --- a/arch/mips/ath79/dev-spi.h +++ b/arch/mips/ath79/dev-spi.h @@ -13,7 +13,7 @@ #define _ATH79_DEV_SPI_H #include <linux/spi/spi.h> -#include <asm/mach-ath79/ath79_spi_platform.h> +#include <linux/platform_data/spi-ath79.h> void ath79_register_spi(struct ath79_spi_platform_data *pdata, struct spi_board_info const *info, diff --git a/arch/mips/include/asm/mach-ath79/ath79_spi_platform.h b/arch/mips/include/asm/mach-ath79/ath79_spi_platform.h deleted file mode 100644 index aa71216edf99..000000000000 --- a/arch/mips/include/asm/mach-ath79/ath79_spi_platform.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Platform data definition for Atheros AR71XX/AR724X/AR913X SPI controller - * - * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org> - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 as published - * by the Free Software Foundation. - */ - -#ifndef _ATH79_SPI_PLATFORM_H -#define _ATH79_SPI_PLATFORM_H - -struct ath79_spi_platform_data { - unsigned bus_num; - unsigned num_chipselect; -}; - -#endif /* _ATH79_SPI_PLATFORM_H */ |