[PATCH] net: macb: fix build break with !CONFIG_OF

Subsystems: atmel macb ethernet driver, networking drivers, the rest

STALE5359d

3 messages, 3 authors, 2011-12-21 · open the first message on its own page

[PATCH] net: macb: fix build break with !CONFIG_OF

From: Olof Johansson <hidden>
Date: 2011-12-20 21:20:29

This fixes the build of the macb driver that was broken by the DT changes:

drivers/net/ethernet/cadence/macb.c:1503: error: implicit declaration of function 'of_match_ptr'
drivers/net/ethernet/cadence/macb.c:1503: error: 'macb_dt_ids' undeclared here (not in a function)
drivers/net/ethernet/cadence/macb.c:1503: error: initializer element is not constant
drivers/net/ethernet/cadence/macb.c:1503: error: (near initialization for 'macb_driver.driver.of_match_table')

Signed-off-by: Olof Johansson <redacted>
---

Nicolas, care to ack this so I can apply it on top of the macb DT branch in arm-soc?

 drivers/net/ethernet/cadence/macb.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
index baf1a0d..f3d5c65 100644
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c
@@ -23,6 +23,7 @@
 #include <linux/platform_data/macb.h>
 #include <linux/platform_device.h>
 #include <linux/phy.h>
+#include <linux/of.h>
 #include <linux/of_device.h>
 #include <linux/of_net.h>
 
-- 
1.7.5.4

[PATCH] net: macb: fix build break with !CONFIG_OF

From: davem@davemloft.net (David Miller)
Date: 2011-12-21 06:04:46

From: Olof Johansson <redacted>
Date: Tue, 20 Dec 2011 13:20:29 -0800
This fixes the build of the macb driver that was broken by the DT changes:

drivers/net/ethernet/cadence/macb.c:1503: error: implicit declaration of function 'of_match_ptr'
drivers/net/ethernet/cadence/macb.c:1503: error: 'macb_dt_ids' undeclared here (not in a function)
drivers/net/ethernet/cadence/macb.c:1503: error: initializer element is not constant
drivers/net/ethernet/cadence/macb.c:1503: error: (near initialization for 'macb_driver.driver.of_match_table')

Signed-off-by: Olof Johansson <redacted>
---

Nicolas, care to ack this so I can apply it on top of the macb DT branch in arm-soc?
Yes, please apply it there.

[PATCH] net: macb: fix build break with !CONFIG_OF

From: Nicolas Ferre <hidden>
Date: 2011-12-21 21:34:55

On 12/20/2011 10:20 PM, Olof Johansson :
This fixes the build of the macb driver that was broken by the DT changes:

drivers/net/ethernet/cadence/macb.c:1503: error: implicit declaration of function 'of_match_ptr'
drivers/net/ethernet/cadence/macb.c:1503: error: 'macb_dt_ids' undeclared here (not in a function)
drivers/net/ethernet/cadence/macb.c:1503: error: initializer element is not constant
drivers/net/ethernet/cadence/macb.c:1503: error: (near initialization for 'macb_driver.driver.of_match_table')

Signed-off-by: Olof Johansson <redacted>
Acked-by: Nicolas Ferre <redacted>

Olof, thanks for this patch.

Best regards,
quoted hunk
---

Nicolas, care to ack this so I can apply it on top of the macb DT branch in arm-soc?

 drivers/net/ethernet/cadence/macb.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
index baf1a0d..f3d5c65 100644
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c
@@ -23,6 +23,7 @@
 #include <linux/platform_data/macb.h>
 #include <linux/platform_device.h>
 #include <linux/phy.h>
+#include <linux/of.h>
 #include <linux/of_device.h>
 #include <linux/of_net.h>
 

-- 
Nicolas Ferre
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help