* [PATCH 06/12] net: use linux/of_{device,platform}.h instead of asm
[not found] <20080523161627.a75d5010.sfr@canb.auug.org.au>
@ 2008-05-23 6:28 ` Stephen Rothwell
2008-05-23 7:09 ` Kumar Gala
2008-06-27 4:58 ` Jeff Garzik
0 siblings, 2 replies; 6+ messages in thread
From: Stephen Rothwell @ 2008-05-23 6:28 UTC (permalink / raw)
To: Jeff Garzik; +Cc: ppc-dev, netdev
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
drivers/net/fs_enet/fs_enet-main.c | 2 +-
drivers/net/fs_enet/mac-scc.c | 2 +-
drivers/net/fs_enet/mii-fec.c | 2 +-
drivers/net/ibm_newemac/core.h | 2 +-
drivers/net/ucc_geth.c | 2 +-
drivers/net/ucc_geth_mii.c | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c
index 67b4b07..1231048 100644
--- a/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/fs_enet/fs_enet-main.c
@@ -43,7 +43,7 @@
#include <asm/uaccess.h>
#ifdef CONFIG_PPC_CPM_NEW_BINDING
-#include <asm/of_platform.h>
+#include <linux/of_platform.h>
#endif
#include "fs_enet.h"
diff --git a/drivers/net/fs_enet/mac-scc.c b/drivers/net/fs_enet/mac-scc.c
index d7ca319..e3557ec 100644
--- a/drivers/net/fs_enet/mac-scc.c
+++ b/drivers/net/fs_enet/mac-scc.c
@@ -44,7 +44,7 @@
#endif
#ifdef CONFIG_PPC_CPM_NEW_BINDING
-#include <asm/of_platform.h>
+#include <linux/of_platform.h>
#endif
#include "fs_enet.h"
diff --git a/drivers/net/fs_enet/mii-fec.c b/drivers/net/fs_enet/mii-fec.c
index f0014cf..8f6a43b 100644
--- a/drivers/net/fs_enet/mii-fec.c
+++ b/drivers/net/fs_enet/mii-fec.c
@@ -37,7 +37,7 @@
#include <asm/uaccess.h>
#ifdef CONFIG_PPC_CPM_NEW_BINDING
-#include <asm/of_platform.h>
+#include <linux/of_platform.h>
#endif
#include "fs_enet.h"
diff --git a/drivers/net/ibm_newemac/core.h b/drivers/net/ibm_newemac/core.h
index 1683db9..2230904 100644
--- a/drivers/net/ibm_newemac/core.h
+++ b/drivers/net/ibm_newemac/core.h
@@ -33,8 +33,8 @@
#include <linux/netdevice.h>
#include <linux/dma-mapping.h>
#include <linux/spinlock.h>
+#include <linux/of_platform.h>
-#include <asm/of_platform.h>
#include <asm/io.h>
#include <asm/dcr.h>
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index ca0bdac..1fb504c 100644
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -28,8 +28,8 @@
#include <linux/mii.h>
#include <linux/phy.h>
#include <linux/workqueue.h>
+#include <linux/of_platform.h>
-#include <asm/of_platform.h>
#include <asm/uaccess.h>
#include <asm/irq.h>
#include <asm/io.h>
diff --git a/drivers/net/ucc_geth_mii.c b/drivers/net/ucc_geth_mii.c
index 9404747..6d9e7ad 100644
--- a/drivers/net/ucc_geth_mii.c
+++ b/drivers/net/ucc_geth_mii.c
@@ -36,8 +36,8 @@
#include <linux/mii.h>
#include <linux/phy.h>
#include <linux/fsl_devices.h>
+#include <linux/of_platform.h>
-#include <asm/of_platform.h>
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/uaccess.h>
--
1.5.5.1
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 06/12] net: use linux/of_{device,platform}.h instead of asm
2008-05-23 6:28 ` [PATCH 06/12] net: use linux/of_{device,platform}.h instead of asm Stephen Rothwell
@ 2008-05-23 7:09 ` Kumar Gala
2008-06-27 4:58 ` Jeff Garzik
1 sibling, 0 replies; 6+ messages in thread
From: Kumar Gala @ 2008-05-23 7:09 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Jeff Garzik, ppc-dev, netdev
On May 23, 2008, at 1:28 AM, Stephen Rothwell wrote:
>
> Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
> ---
> drivers/net/fs_enet/fs_enet-main.c | 2 +-
> drivers/net/fs_enet/mac-scc.c | 2 +-
> drivers/net/fs_enet/mii-fec.c | 2 +-
> drivers/net/ibm_newemac/core.h | 2 +-
> drivers/net/ucc_geth.c | 2 +-
> drivers/net/ucc_geth_mii.c | 2 +-
> 6 files changed, 6 insertions(+), 6 deletions(-)
Acked-by: Kumar Gala <galak@kernel•crashing.org>
- k
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 06/12] net: use linux/of_{device,platform}.h instead of asm
2008-05-23 6:28 ` [PATCH 06/12] net: use linux/of_{device,platform}.h instead of asm Stephen Rothwell
2008-05-23 7:09 ` Kumar Gala
@ 2008-06-27 4:58 ` Jeff Garzik
2008-07-02 7:55 ` Kumar Gala
1 sibling, 1 reply; 6+ messages in thread
From: Jeff Garzik @ 2008-06-27 4:58 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: ppc-dev, netdev
Stephen Rothwell wrote:
> Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
> ---
> drivers/net/fs_enet/fs_enet-main.c | 2 +-
> drivers/net/fs_enet/mac-scc.c | 2 +-
> drivers/net/fs_enet/mii-fec.c | 2 +-
> drivers/net/ibm_newemac/core.h | 2 +-
> drivers/net/ucc_geth.c | 2 +-
> drivers/net/ucc_geth_mii.c | 2 +-
> 6 files changed, 6 insertions(+), 6 deletions(-)
ACK
I'll let a ppc person queue this
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 06/12] net: use linux/of_{device,platform}.h instead of asm
2008-06-27 4:58 ` Jeff Garzik
@ 2008-07-02 7:55 ` Kumar Gala
2008-07-03 1:28 ` Stephen Rothwell
0 siblings, 1 reply; 6+ messages in thread
From: Kumar Gala @ 2008-07-02 7:55 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Jeff Garzik, ppc-dev, netdev
On Jun 26, 2008, at 11:58 PM, Jeff Garzik wrote:
> Stephen Rothwell wrote:
>> Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
>> ---
>> drivers/net/fs_enet/fs_enet-main.c | 2 +-
>> drivers/net/fs_enet/mac-scc.c | 2 +-
>> drivers/net/fs_enet/mii-fec.c | 2 +-
>> drivers/net/ibm_newemac/core.h | 2 +-
>> drivers/net/ucc_geth.c | 2 +-
>> drivers/net/ucc_geth_mii.c | 2 +-
>> 6 files changed, 6 insertions(+), 6 deletions(-)
>
> ACK
>
> I'll let a ppc person queue this
I'll pick it up (since it mainly touches fsl enet controllers) if you
can repost it. I seem to have lost the patch.
- k
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 06/12] net: use linux/of_{device,platform}.h instead of asm
2008-07-02 7:55 ` Kumar Gala
@ 2008-07-03 1:28 ` Stephen Rothwell
2008-07-08 13:28 ` Kumar Gala
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2008-07-03 1:28 UTC (permalink / raw)
To: Kumar Gala; +Cc: ppc-dev, Jeff Garzik, netdev
Hi Kumar,
On Wed, 2 Jul 2008 02:55:29 -0500 Kumar Gala <galak@kernel•crashing.org> wrote:
>
> I'll pick it up (since it mainly touches fsl enet controllers) if you
> can repost it. I seem to have lost the patch.
Here you go.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
Date: Fri, 23 May 2008 16:28:54 +1000
From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jeff Garzik <jeff@garzik•org>
Cc: ppc-dev <linuxppc-dev@ozlabs•org>, netdev@vger•kernel.org
Subject: [PATCH 06/12] net: use linux/of_{device,platform}.h instead of asm
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
drivers/net/fs_enet/fs_enet-main.c | 2 +-
drivers/net/fs_enet/mac-scc.c | 2 +-
drivers/net/fs_enet/mii-fec.c | 2 +-
drivers/net/ibm_newemac/core.h | 2 +-
drivers/net/ucc_geth.c | 2 +-
drivers/net/ucc_geth_mii.c | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c
index 67b4b07..1231048 100644
--- a/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/fs_enet/fs_enet-main.c
@@ -43,7 +43,7 @@
#include <asm/uaccess.h>
#ifdef CONFIG_PPC_CPM_NEW_BINDING
-#include <asm/of_platform.h>
+#include <linux/of_platform.h>
#endif
#include "fs_enet.h"
diff --git a/drivers/net/fs_enet/mac-scc.c b/drivers/net/fs_enet/mac-scc.c
index d7ca319..e3557ec 100644
--- a/drivers/net/fs_enet/mac-scc.c
+++ b/drivers/net/fs_enet/mac-scc.c
@@ -44,7 +44,7 @@
#endif
#ifdef CONFIG_PPC_CPM_NEW_BINDING
-#include <asm/of_platform.h>
+#include <linux/of_platform.h>
#endif
#include "fs_enet.h"
diff --git a/drivers/net/fs_enet/mii-fec.c b/drivers/net/fs_enet/mii-fec.c
index f0014cf..8f6a43b 100644
--- a/drivers/net/fs_enet/mii-fec.c
+++ b/drivers/net/fs_enet/mii-fec.c
@@ -37,7 +37,7 @@
#include <asm/uaccess.h>
#ifdef CONFIG_PPC_CPM_NEW_BINDING
-#include <asm/of_platform.h>
+#include <linux/of_platform.h>
#endif
#include "fs_enet.h"
diff --git a/drivers/net/ibm_newemac/core.h b/drivers/net/ibm_newemac/core.h
index 1683db9..2230904 100644
--- a/drivers/net/ibm_newemac/core.h
+++ b/drivers/net/ibm_newemac/core.h
@@ -33,8 +33,8 @@
#include <linux/netdevice.h>
#include <linux/dma-mapping.h>
#include <linux/spinlock.h>
+#include <linux/of_platform.h>
-#include <asm/of_platform.h>
#include <asm/io.h>
#include <asm/dcr.h>
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index ca0bdac..1fb504c 100644
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -28,8 +28,8 @@
#include <linux/mii.h>
#include <linux/phy.h>
#include <linux/workqueue.h>
+#include <linux/of_platform.h>
-#include <asm/of_platform.h>
#include <asm/uaccess.h>
#include <asm/irq.h>
#include <asm/io.h>
diff --git a/drivers/net/ucc_geth_mii.c b/drivers/net/ucc_geth_mii.c
index 9404747..6d9e7ad 100644
--- a/drivers/net/ucc_geth_mii.c
+++ b/drivers/net/ucc_geth_mii.c
@@ -36,8 +36,8 @@
#include <linux/mii.h>
#include <linux/phy.h>
#include <linux/fsl_devices.h>
+#include <linux/of_platform.h>
-#include <asm/of_platform.h>
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/uaccess.h>
--
1.5.5.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 06/12] net: use linux/of_{device,platform}.h instead of asm
2008-07-03 1:28 ` Stephen Rothwell
@ 2008-07-08 13:28 ` Kumar Gala
0 siblings, 0 replies; 6+ messages in thread
From: Kumar Gala @ 2008-07-08 13:28 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Jeff Garzik, ppc-dev, netdev
On Jul 2, 2008, at 8:28 PM, Stephen Rothwell wrote:
> Hi Kumar,
>
> On Wed, 2 Jul 2008 02:55:29 -0500 Kumar Gala <galak@kernel•crashing.org
> > wrote:
>>
>> I'll pick it up (since it mainly touches fsl enet controllers) if you
>> can repost it. I seem to have lost the patch.
>
> Here you go.
> --
> Cheers,
> Stephen Rothwell sfr@canb•auug.org.au
> http://www.canb.auug.org.au/~sfr/
Thanks, there have been a number of changes so this doesn't apply
anymore. I'd suggest we hold on to it for a little while and let the
driver churn calm down first.
- k
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2008-07-08 13:29 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20080523161627.a75d5010.sfr@canb.auug.org.au>
2008-05-23 6:28 ` [PATCH 06/12] net: use linux/of_{device,platform}.h instead of asm Stephen Rothwell
2008-05-23 7:09 ` Kumar Gala
2008-06-27 4:58 ` Jeff Garzik
2008-07-02 7:55 ` Kumar Gala
2008-07-03 1:28 ` Stephen Rothwell
2008-07-08 13:28 ` Kumar Gala
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox