diff options
| author | David Vrabel <david.vrabel@csr.com> | 2008-12-08 17:18:47 +0100 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-12-08 17:18:47 +0100 |
| commit | c35fa3ea1ae8198bd65c2c6e59d9ebd68c115a59 (patch) | |
| tree | 878768b69df25459b448aa890352342c4a3c6e2d /drivers/char/istallion.c | |
| parent | wusb: add debug files for ASL, PZL and DI to the whci-hcd driver (diff) | |
| parent | Fix a race condition in FASYNC handling (diff) | |
| download | linux-c35fa3ea1ae8198bd65c2c6e59d9ebd68c115a59.tar.xz linux-c35fa3ea1ae8198bd65c2c6e59d9ebd68c115a59.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'drivers/char/istallion.c')
| -rw-r--r-- | drivers/char/istallion.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c index 44e5d60f517e..4b10770fa937 100644 --- a/drivers/char/istallion.c +++ b/drivers/char/istallion.c @@ -3739,7 +3739,7 @@ static int stli_getbrdnr(void) * do is go probing around in the usual places hoping we can find it. */ -static int stli_findeisabrds(void) +static int __init stli_findeisabrds(void) { struct stlibrd *brdp; unsigned int iobase, eid, i; @@ -3935,7 +3935,7 @@ static struct stlibrd *stli_allocbrd(void) * can find. */ -static int stli_initbrds(void) +static int __init stli_initbrds(void) { struct stlibrd *brdp, *nxtbrdp; struct stlconf conf; |