git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
net
/
mace.c
diff --git
a/drivers/net/mace.c
b/drivers/net/mace.c
index
6ed2d7d
..
77792b2
100644
(file)
--- a/
drivers/net/mace.c
+++ b/
drivers/net/mace.c
@@
-109,7
+109,7
@@
bitrev(int b)
}
}
-static int __devinit mace_probe(struct macio_dev *mdev, const struct of_
match
*match)
+static int __devinit mace_probe(struct macio_dev *mdev, const struct of_
device_id
*match)
{
struct device_node *mace = macio_get_of_node(mdev);
struct net_device *dev;
{
struct device_node *mace = macio_get_of_node(mdev);
struct net_device *dev;
@@
-1009,15
+1009,14
@@
static irqreturn_t mace_rxdma_intr(int irq, void *dev_id, struct pt_regs *regs)
return IRQ_HANDLED;
}
return IRQ_HANDLED;
}
-static struct of_
match
mace_match[] =
+static struct of_
device_id
mace_match[] =
{
{
.name = "mace",
{
{
.name = "mace",
- .type = OF_ANY_MATCH,
- .compatible = OF_ANY_MATCH
},
{},
};
},
{},
};
+MODULE_DEVICE_TABLE (of, mace_match);
static struct macio_driver mace_driver =
{
static struct macio_driver mace_driver =
{
@@
-1037,15
+1036,13
@@
static void __exit mace_cleanup(void)
{
macio_unregister_driver(&mace_driver);
{
macio_unregister_driver(&mace_driver);
- if (dummy_buf) {
- kfree(dummy_buf);
- dummy_buf = NULL;
- }
+ kfree(dummy_buf);
+ dummy_buf = NULL;
}
MODULE_AUTHOR("Paul Mackerras");
MODULE_DESCRIPTION("PowerMac MACE driver.");
}
MODULE_AUTHOR("Paul Mackerras");
MODULE_DESCRIPTION("PowerMac MACE driver.");
-
MODULE_PARM(port_aaui, "i"
);
+
module_param(port_aaui, int, 0
);
MODULE_PARM_DESC(port_aaui, "MACE uses AAUI port (0-1)");
MODULE_LICENSE("GPL");
MODULE_PARM_DESC(port_aaui, "MACE uses AAUI port (0-1)");
MODULE_LICENSE("GPL");