projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
[linux-drm-fsl-dcu.git]
/
drivers
/
net
/
ethernet
/
hisilicon
/
hip04_eth.c
diff --git
a/drivers/net/ethernet/hisilicon/hip04_eth.c
b/drivers/net/ethernet/hisilicon/hip04_eth.c
index cc2d8b4b18e3e2a99ef303b76809545496089787..253f8ed0537a058778fd08b2c5a0747f53d7eca4 100644
(file)
--- 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));