sh: modify the asm/sh_eth.h to linux/sh_eth.h in some boards

PATCH Applied Yoshihiro Shimoda 3 participants 5 messages Sep 28, 2011 – Nov 1, 2011 SuperH

lore

Share & tools

lore

Yoshihiro Shimoda

author

2011-09-28 07:49 UTC #0 lore raw

PATCH 1/1 sh: modify the asm/sh_eth.h to linux/sh_eth.h in some boards

Signed-off-by Yoshihiro Shimoda <[email protected]>

---
- This patch depends on the following patch:
- net: sh_eth: move the asm/sh_eth.h to include/linux/
- This patch doesn't contain board-sh7757lcr.c, because it needs more modification.

 arch/sh/boards/board-espt.c           |    2 +-
 arch/sh/boards/mach-ecovec24/setup.c  |    2 +-
 arch/sh/boards/mach-se/7724/setup.c   |    2 +-
 arch/sh/boards/mach-sh7763rdp/setup.c |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

arch/sh/boards/board-espt.c +1 -1

index 9da92ac..b3ae9d3 100644
@@ -13,9 +13,9 @@
 #include <linux/interrupt.h>
 #include <linux/mtd/physmap.h>
 #include <linux/io.h>
+#include <linux/sh_eth.h>
 #include <asm/machvec.h>
 #include <asm/sizes.h>
-#include <asm/sh_eth.h>
 
 /* NOR Flash */
 static struct mtd_partition espt_nor_flash_partitions[] = {

arch/sh/boards/mach-ecovec24/setup.c +1 -1

index b24d69d..7f74985 100644
@@ -28,13 +28,13 @@
 #include <linux/spi/mmc_spi.h>
 #include <linux/input.h>
 #include <linux/input/sh_keysc.h>
+#include <linux/sh_eth.h>
 #include <video/sh_mobile_lcdc.h>
 #include <sound/sh_fsi.h>
 #include <media/sh_mobile_ceu.h>
 #include <media/tw9910.h>
 #include <media/mt9t112.h>
 #include <asm/heartbeat.h>
-#include <asm/sh_eth.h>
 #include <asm/clock.h>
 #include <asm/suspend.h>
 #include <cpu/sh7724.h>

arch/sh/boards/mach-se/7724/setup.c +1 -1

index d007567..b747c0a 100644
@@ -23,12 +23,12 @@
 #include <linux/input.h>
 #include <linux/input/sh_keysc.h>
 #include <linux/usb/r8a66597.h>
+#include <linux/sh_eth.h>
 #include <video/sh_mobile_lcdc.h>
 #include <media/sh_mobile_ceu.h>
 #include <sound/sh_fsi.h>
 #include <asm/io.h>
 #include <asm/heartbeat.h>
-#include <asm/sh_eth.h>
 #include <asm/clock.h>
 #include <asm/suspend.h>
 #include <cpu/sh7724.h>

arch/sh/boards/mach-sh7763rdp/setup.c +1 -1

index f3d828f..dd036f1 100644
@@ -17,8 +17,8 @@
 #include <linux/mtd/physmap.h>
 #include <linux/fb.h>
 #include <linux/io.h>
+#include <linux/sh_eth.h>
 #include <mach/sh7763rdp.h>
-#include <asm/sh_eth.h>
 #include <asm/sh7760fb.h>
 
 /* NOR Flash */

Signature · 1 line

1.7.1

Nobuhiro Iwamatsu

Tested-by on v1 1/1

2011-09-30 06:18 UTC #1 lore raw

Tested-by Nobuhiro Iwamatsu <[email protected]>

2011/9/28 Yoshihiro Shimoda <[email protected]>:

Quoted 86 lines

Signed-off-by Yoshihiro Shimoda <[email protected]>

---
- This patch depends on the following patch:
- net: sh_eth: move the asm/sh_eth.h to include/linux/
- This patch doesn't contain board-sh7757lcr.c, because it needs more modification.

arch/sh/boards/board-espt.c | 2 +-
arch/sh/boards/mach-ecovec24/setup.c | 2 +-
arch/sh/boards/mach-se/7724/setup.c | 2 +-
arch/sh/boards/mach-sh7763rdp/setup.c | 2 +-

 4 files changed, 4 insertions(+), 4 deletions(-)

arch/sh/boards/board-espt.c +1 -1

index 9da92ac..b3ae9d3 100644
@@ -13,9 +13,9 @@
  #include <linux/interrupt.h>
  #include <linux/mtd/physmap.h>
  #include <linux/io.h>
+#include <linux/sh_eth.h>
  #include <asm/machvec.h>
  #include <asm/sizes.h>
-#include <asm/sh_eth.h>
 
  /* NOR Flash */
  static struct mtd_partition espt_nor_flash_partitions[] = {

arch/sh/boards/mach-ecovec24/setup.c +1 -1

index b24d69d..7f74985 100644
@@ -28,13 +28,13 @@
  #include <linux/spi/mmc_spi.h>
  #include <linux/input.h>
  #include <linux/input/sh_keysc.h>
+#include <linux/sh_eth.h>
  #include <video/sh_mobile_lcdc.h>
  #include <sound/sh_fsi.h>
  #include <media/sh_mobile_ceu.h>
  #include <media/tw9910.h>
  #include <media/mt9t112.h>
  #include <asm/heartbeat.h>
-#include <asm/sh_eth.h>
  #include <asm/clock.h>
  #include <asm/suspend.h>
  #include <cpu/sh7724.h>

arch/sh/boards/mach-se/7724/setup.c +1 -1

index d007567..b747c0a 100644
@@ -23,12 +23,12 @@
  #include <linux/input.h>
  #include <linux/input/sh_keysc.h>
  #include <linux/usb/r8a66597.h>
+#include <linux/sh_eth.h>
  #include <video/sh_mobile_lcdc.h>
  #include <media/sh_mobile_ceu.h>
  #include <sound/sh_fsi.h>
  #include <asm/io.h>
  #include <asm/heartbeat.h>
-#include <asm/sh_eth.h>
  #include <asm/clock.h>
  #include <asm/suspend.h>
  #include <cpu/sh7724.h>

arch/sh/boards/mach-sh7763rdp/setup.c +1 -2

index f3d828f..dd036f1 100644
@@ -17,8 +17,8 @@
  #include <linux/mtd/physmap.h>
  #include <linux/fb.h>
  #include <linux/io.h>
+#include <linux/sh_eth.h>
  #include <mach/sh7763rdp.h>
-#include <asm/sh_eth.h>
  #include <asm/sh7760fb.h>
 
  /* NOR Flash */
--

1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Signature · 1 line

Nobuhiro Iwamatsu

Paul Mundt

Applied

2011-10-28 06:09 UTC #2 lore raw

In reply to Yoshihiro Shimoda

Quoted 7 lines · Yoshihiro Shimoda

Signed-off-by Yoshihiro Shimoda <[email protected]>
---
- This patch depends on the following patch:
- net: sh_eth: move the asm/sh_eth.h to include/linux/
- This patch doesn't contain board-sh7757lcr.c, because it needs more modification.

Quoted 6 lines

 arch/sh/boards/board-espt.c           |    2 +-
 arch/sh/boards/mach-ecovec24/setup.c  |    2 +-
 arch/sh/boards/mach-se/7724/setup.c   |    2 +-
 arch/sh/boards/mach-sh7763rdp/setup.c |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

Applied, thanks.

Nobuhiro Iwamatsu

2011-11-01 05:54 UTC #3 lore raw

PATCH 1/1 sh: modify the asm/sh_eth.h to linux/sh_eth.h in sh7757lcr

In reply to Yoshihiro Shimoda

Signed-off-by Nobuhiro Iwamatsu <[email protected]>

---
 arch/sh/boards/board-sh7757lcr.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

arch/sh/boards/board-sh7757lcr.c +1 -1

index fa2a208..ec8c84c 100644
@@ -18,8 +18,8 @@
 #include <linux/mmc/host.h>
 #include <linux/mmc/sh_mmcif.h>
 #include <linux/mmc/sh_mobile_sdhi.h>
+#include <linux/sh_eth.h>
 #include <cpu/sh7757.h>
-#include <asm/sh_eth.h>
 #include <asm/heartbeat.h>
 
 static struct resource heartbeat_resource = {

Signature · 1 line

1.7.7

Paul Mundt

2011-11-01 07:00 UTC #4 lore raw

Re: [PATCH] sh: modify the asm/sh_eth.h to linux/sh_eth.h in sh7757lcr

In reply to Yoshihiro Shimoda

Quoted 4 lines · Nobuhiro Iwamatsu

Signed-off-by Nobuhiro Iwamatsu <[email protected]>
---
 arch/sh/boards/board-sh7757lcr.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Quoted 4 lines · Nobuhiro Iwamatsu

Signed-off-by Nobuhiro Iwamatsu <[email protected]>
---
 arch/sh/Makefile |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

Both applied, thanks.