diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-07-12 07:10:18 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-07-12 07:10:18 +0200 |
| commit | 5ed435f33dc6a31cd93b6f38a14dd775977cf1cc (patch) | |
| tree | a5679efee0260214cece15ba83938e4c6f007f11 /include/of_device.h | |
| parent | 05f49fa0edb6166f80b8a37a172d6b83db2d92d1 (diff) | |
| parent | ba927c778091295310fdb105e10c257a0cfc61a3 (diff) | |
| download | barebox-5ed435f33dc6a31cd93b6f38a14dd775977cf1cc.tar.gz barebox-5ed435f33dc6a31cd93b6f38a14dd775977cf1cc.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'include/of_device.h')
| -rw-r--r-- | include/of_device.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/of_device.h b/include/of_device.h index 44c1c0f545..54410ad12f 100644 --- a/include/of_device.h +++ b/include/of_device.h @@ -22,7 +22,7 @@ static inline int of_driver_match_device(struct device_d *dev, extern const void *of_device_get_match_data(const struct device_d *dev); -#else /* CONFIG_OF */ +#else /* CONFIG_OFTREE */ static inline int of_driver_match_device(struct device_d *dev, const struct device_d *drv) @@ -43,6 +43,6 @@ static inline const struct of_device_id *__of_match_device( #define of_match_device(matches, dev) \ __of_match_device(matches, (dev)) -#endif /* CONFIG_OF */ +#endif /* CONFIG_OFTREE */ #endif /* _LINUX_OF_DEVICE_H */ |