diff options
author | Alexey Dobriyan <adobriyan@sw.ru> | 2007-07-19 04:49:10 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 13:04:50 -0400 |
commit | e3aded3cc289113c7bc729ef4cb75e56d9aa71be (patch) | |
tree | b9c3d300af48b519375315f2ee4819f8b2a2a0e6 /drivers/isdn/sc/command.c | |
parent | 7ac674f52778b95450509357435320be1d795248 (diff) |
isdn/sc: compile breakage re check_reset()
There is check_reset() -- global function in drivers/isdn/sc/
There is check_reset -- variable holding module param in aacraid driver.
On allyesconfig they clash with:
LD drivers/built-in.o
drivers/isdn/built-in.o: In function `check_reset':
: multiple definition of `check_reset'
drivers/scsi/built-in.o:(.data+0xe458): first defined here
ld: Warning: size of symbol `check_reset' changed from 4 in drivers/scsi/built-in.o to 219 in drivers/isdn/built-in.o
ld: Warning: type of symbol `check_reset' changed from 1 to 2 in drivers/isdn/built-in.o
Rename the former.
Signed-off-by: Alexey Dobriyan <adobriyan@sw.ru>
Cc: Karsten Keil <kkeil@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/isdn/sc/command.c')
-rw-r--r-- | drivers/isdn/sc/command.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/isdn/sc/command.c b/drivers/isdn/sc/command.c index b7bb7cbcf503..0e4969c2ef95 100644 --- a/drivers/isdn/sc/command.c +++ b/drivers/isdn/sc/command.c | |||
@@ -344,7 +344,7 @@ int reset(int card) | |||
344 | 344 | ||
345 | spin_lock_irqsave(&sc_adapter[card]->lock, flags); | 345 | spin_lock_irqsave(&sc_adapter[card]->lock, flags); |
346 | init_timer(&sc_adapter[card]->reset_timer); | 346 | init_timer(&sc_adapter[card]->reset_timer); |
347 | sc_adapter[card]->reset_timer.function = check_reset; | 347 | sc_adapter[card]->reset_timer.function = sc_check_reset; |
348 | sc_adapter[card]->reset_timer.data = card; | 348 | sc_adapter[card]->reset_timer.data = card; |
349 | sc_adapter[card]->reset_timer.expires = jiffies + CHECKRESET_TIME; | 349 | sc_adapter[card]->reset_timer.expires = jiffies + CHECKRESET_TIME; |
350 | add_timer(&sc_adapter[card]->reset_timer); | 350 | add_timer(&sc_adapter[card]->reset_timer); |