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 branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6
[pandora-kernel.git]
/
drivers
/
net
/
3c59x.c
diff --git
a/drivers/net/3c59x.c
b/drivers/net/3c59x.c
index
99f43d2
..
8cc2256
100644
(file)
--- a/
drivers/net/3c59x.c
+++ b/
drivers/net/3c59x.c
@@
-901,14
+901,14
@@
static const struct dev_pm_ops vortex_pm_ops = {
#endif /* !CONFIG_PM */
#ifdef CONFIG_EISA
#endif /* !CONFIG_PM */
#ifdef CONFIG_EISA
-static
const struct eisa_device_id vortex_eisa_ids[] __devinitconst
= {
+static
struct eisa_device_id vortex_eisa_ids[]
= {
{ "TCM5920", CH_3C592 },
{ "TCM5970", CH_3C597 },
{ "" }
};
MODULE_DEVICE_TABLE(eisa, vortex_eisa_ids);
{ "TCM5920", CH_3C592 },
{ "TCM5970", CH_3C597 },
{ "" }
};
MODULE_DEVICE_TABLE(eisa, vortex_eisa_ids);
-static int __
dev
init vortex_eisa_probe(struct device *device)
+static int __init vortex_eisa_probe(struct device *device)
{
void __iomem *ioaddr;
struct eisa_device *edev;
{
void __iomem *ioaddr;
struct eisa_device *edev;