diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-10-02 08:54:42 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-10-02 08:54:42 +0200 |
| commit | 6209c242748e53a64ec7a2b41c30cc6a894a784e (patch) | |
| tree | 378d979ebb5570db0a256f4b14e6b880d79c57b6 /drivers | |
| parent | 5aa553e4b688175ecd478468e0456b299d441f60 (diff) | |
| parent | fbac1f3fb2166e3715170479b347a1b0f24df658 (diff) | |
| download | barebox-6209c242748e53a64ec7a2b41c30cc6a894a784e.tar.gz barebox-6209c242748e53a64ec7a2b41c30cc6a894a784e.tar.xz | |
Merge branch 'for-next/openrisc'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethoc.c | 6 | ||||
| -rw-r--r-- | drivers/of/Kconfig | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c index 679e1e552a..35d7d4623b 100644 --- a/drivers/net/ethoc.c +++ b/drivers/net/ethoc.c @@ -565,8 +565,14 @@ static int ethoc_probe(struct device_d *dev) return 0; } +static struct of_device_id ethoc_dt_ids[] = { + { .compatible = "opencores,ethoc", }, + { } +}; + static struct driver_d ethoc_driver = { .name = "ethoc", .probe = ethoc_probe, + .of_compatible = DRV_OF_COMPAT(ethoc_dt_ids), }; device_platform_driver(ethoc_driver); diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig index 81955063d7..97a1d933ec 100644 --- a/drivers/of/Kconfig +++ b/drivers/of/Kconfig @@ -4,7 +4,7 @@ config OFTREE config OFTREE_MEM_GENERIC depends on OFTREE - depends on PPC || ARM || ARCH_EFI + depends on PPC || ARM || ARCH_EFI || OPENRISC def_bool y config DTC |