diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-12-07 08:12:40 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-12-07 08:12:40 +0100 |
| commit | b9dcb4ae01b034da77ba56b1886c8d04971f5cec (patch) | |
| tree | 13587ee09dd1301be2919a3a503d1c335eab1fce | |
| parent | 1d8bb9be35508b62a6f6d0d792fa29568710a2a9 (diff) | |
| parent | 9274aa90262083075eb95d4bbac3067c96aa7b14 (diff) | |
| download | barebox-b9dcb4ae01b034da77ba56b1886c8d04971f5cec.tar.gz barebox-b9dcb4ae01b034da77ba56b1886c8d04971f5cec.tar.xz | |
Merge branch 'for-next/misc'
| -rw-r--r-- | arch/arm/mach-at91/Kconfig | 1 | ||||
| -rw-r--r-- | include/of_device.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index 7a895c2689..b101e61d22 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig @@ -538,6 +538,7 @@ config MACH_AT91SAM9X5EK config MACH_MICROCHIP_KSZ9477_EVB bool "Microchip EVB-KSZ9477 Evaluation Kit" + depends on ARCH_SAMA5D3 select OFDEVICE select COMMON_CLK_OF_PROVIDER help diff --git a/include/of_device.h b/include/of_device.h index e84fc9c377..44c1c0f545 100644 --- a/include/of_device.h +++ b/include/of_device.h @@ -41,7 +41,7 @@ static inline const struct of_device_id *__of_match_device( return NULL; } #define of_match_device(matches, dev) \ - __of_match_device(of_match_ptr(matches), (dev)) + __of_match_device(matches, (dev)) #endif /* CONFIG_OF */ |