You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
sh_eth: get SH7724 support out of #ifdef
Get the SH7724 code/data in the driver out of #ifdef by adding "r8a7724-ether" to the platform driver's ID table. Change the Ether platform device's name in the SH platform code accordingly. Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
committed by
David S. Miller
parent
24549e2a0f
commit
9c3beaabb9
@@ -165,8 +165,8 @@ static struct sh_eth_plat_data sh_eth_plat = {
|
||||
};
|
||||
|
||||
static struct platform_device sh_eth_device = {
|
||||
.name = "sh-eth",
|
||||
.id = 0,
|
||||
.name = "sh7724-ether",
|
||||
.id = 0,
|
||||
.dev = {
|
||||
.platform_data = &sh_eth_plat,
|
||||
},
|
||||
|
||||
@@ -380,8 +380,8 @@ static struct sh_eth_plat_data sh_eth_plat = {
|
||||
};
|
||||
|
||||
static struct platform_device sh_eth_device = {
|
||||
.name = "sh-eth",
|
||||
.id = 0,
|
||||
.name = "sh7724-ether",
|
||||
.id = 0,
|
||||
.dev = {
|
||||
.platform_data = &sh_eth_plat,
|
||||
},
|
||||
|
||||
@@ -329,7 +329,7 @@ static struct clk_lookup lookups[] = {
|
||||
CLKDEV_DEV_ID("i2c-sh_mobile.0", &mstp_clks[HWBLK_IIC0]),
|
||||
CLKDEV_DEV_ID("i2c-sh_mobile.1", &mstp_clks[HWBLK_IIC1]),
|
||||
CLKDEV_DEV_ID("sh_mmcif.0", &mstp_clks[HWBLK_MMC]),
|
||||
CLKDEV_DEV_ID("sh-eth.0", &mstp_clks[HWBLK_ETHER]),
|
||||
CLKDEV_DEV_ID("sh7724-ether.0", &mstp_clks[HWBLK_ETHER]),
|
||||
CLKDEV_CON_ID("atapi0", &mstp_clks[HWBLK_ATAPI]),
|
||||
CLKDEV_CON_ID("tpu0", &mstp_clks[HWBLK_TPU]),
|
||||
CLKDEV_CON_ID("irda0", &mstp_clks[HWBLK_IRDA]),
|
||||
|
||||
Reference in New Issue
Block a user