diff options
| author | David S. Miller <davem@davemloft.net> | 2013-12-20 04:10:14 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-12-20 04:10:14 +0400 |
| commit | 4742e7808ab4bfdb386526c1a2b3ae09372236c3 (patch) | |
| tree | d1e30f9d0941602c58e71bb17f4ab39c67650f88 /include | |
| parent | 9ddffb8a1103e9c716b152a80e46c95cba1ca6b2 (diff) | |
| parent | 4174ecd78f6591a3d1ec04738ef7bc900a11f5ce (diff) | |
| download | linux-4742e7808ab4bfdb386526c1a2b3ae09372236c3.tar.xz | |
Merge branch 'sh_eth'
Sergei Shtylyov says:
====================
Add PHY IRQ support to the 'sh_eth' driver
This patchset adds support for passing PHY's IRQ to the 'sh_eth' driver from
the platform code and removes now useless code that hinders the PHY IRQ handing
by philib.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/sh_eth.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/sh_eth.h b/include/linux/sh_eth.h index 90b5e30c2f22..8c9131db2b25 100644 --- a/include/linux/sh_eth.h +++ b/include/linux/sh_eth.h @@ -8,6 +8,7 @@ enum {EDMAC_LITTLE_ENDIAN, EDMAC_BIG_ENDIAN}; struct sh_eth_plat_data { int phy; + int phy_irq; int edmac_endian; phy_interface_t phy_interface; void (*set_mdio_gate)(void *addr); |
