git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
drivers
/
net
/
arm
/
ep93xx_eth.c
diff --git
a/drivers/net/arm/ep93xx_eth.c
b/drivers/net/arm/ep93xx_eth.c
index
ecd8fc6
..
7a14980
100644
(file)
--- a/
drivers/net/arm/ep93xx_eth.c
+++ b/
drivers/net/arm/ep93xx_eth.c
@@
-848,7
+848,7
@@
static int ep93xx_eth_probe(struct platform_device *pdev)
ep->res = request_mem_region(pdev->resource[0].start,
pdev->resource[0].end - pdev->resource[0].start + 1,
-
pdev->dev.bus_id
);
+
dev_name(&pdev->dev)
);
if (ep->res == NULL) {
dev_err(&pdev->dev, "Could not reserve memory region\n");
err = -ENOMEM;