diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-10-13 12:37:06 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-10-13 12:37:06 +0300 |
| commit | 3c69ea44406bf27b6f2e9b2f11238c344fd8374d (patch) | |
| tree | b459600bfffb55b6693b566f5dff859daa216dbe /drivers/net/ethernet/hisilicon | |
| parent | 53b3ffee788559fe26d32f21b223bf4bad959477 (diff) | |
| parent | e8d65a8d985271a102f07c7456da5b86c19ffe16 (diff) | |
| download | linux-3c69ea44406bf27b6f2e9b2f11238c344fd8374d.tar.xz | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'drivers/net/ethernet/hisilicon')
| -rw-r--r-- | drivers/net/ethernet/hisilicon/hip04_eth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/hisilicon/hip04_eth.c b/drivers/net/ethernet/hisilicon/hip04_eth.c index cc2d8b4b18e3..253f8ed0537a 100644 --- a/drivers/net/ethernet/hisilicon/hip04_eth.c +++ b/drivers/net/ethernet/hisilicon/hip04_eth.c @@ -816,7 +816,7 @@ static int hip04_mac_probe(struct platform_device *pdev) struct net_device *ndev; struct hip04_priv *priv; struct resource *res; - unsigned int irq; + int irq; int ret; ndev = alloc_etherdev(sizeof(struct hip04_priv)); |