diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-25 17:39:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-25 17:39:04 -0700 |
| commit | 7b29122f9ec54db5c38a66a11127d94db0817c17 (patch) | |
| tree | 8a9b5c5937f6fa0167de090dd199b964ec803d5a /drivers | |
| parent | b7de567bf3187ccf776e2fe0e241593cdcba5459 (diff) | |
| parent | be5b6d3d6cb7311893c9fbeebf094591d5f760a8 (diff) | |
| download | linux-stable-7b29122f9ec54db5c38a66a11127d94db0817c17.tar.gz linux-stable-7b29122f9ec54db5c38a66a11127d94db0817c17.tar.bz2 linux-stable-7b29122f9ec54db5c38a66a11127d94db0817c17.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SOUND] sparc/amd7930: Use __devinit and __devinitdata as needed.
[SUNLANCE]: Mark sparc_lance_probe_one as __devinit.
[SPARC64]: Fix section-mismatch errors in solaris emul module.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/sunlance.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/sunlance.c b/drivers/net/sunlance.c index 77670741e101..feb42db10ee1 100644 --- a/drivers/net/sunlance.c +++ b/drivers/net/sunlance.c @@ -1323,9 +1323,9 @@ static const struct ethtool_ops sparc_lance_ethtool_ops = { .get_link = sparc_lance_get_link, }; -static int __init sparc_lance_probe_one(struct sbus_dev *sdev, - struct sbus_dma *ledma, - struct sbus_dev *lebuffer) +static int __devinit sparc_lance_probe_one(struct sbus_dev *sdev, + struct sbus_dma *ledma, + struct sbus_dev *lebuffer) { static unsigned version_printed; struct net_device *dev; @@ -1515,7 +1515,7 @@ fail: } /* On 4m, find the associated dma for the lance chip */ -static inline struct sbus_dma *find_ledma(struct sbus_dev *sdev) +static struct sbus_dma * __devinit find_ledma(struct sbus_dev *sdev) { struct sbus_dma *p; @@ -1533,7 +1533,7 @@ static inline struct sbus_dma *find_ledma(struct sbus_dev *sdev) /* Find all the lance cards on the system and initialize them */ static struct sbus_dev sun4_sdev; -static int __init sparc_lance_init(void) +static int __devinit sparc_lance_init(void) { if ((idprom->id_machtype == (SM_SUN4|SM_4_330)) || (idprom->id_machtype == (SM_SUN4|SM_4_470))) { |