Commit e3aded3c authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Linus Torvalds

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: default avatarAlexey Dobriyan <adobriyan@sw.ru>
Cc: Karsten Keil <kkeil@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7ac674f5
...@@ -125,7 +125,7 @@ int sendmessage(int card, unsigned int procid, unsigned int type, ...@@ -125,7 +125,7 @@ int sendmessage(int card, unsigned int procid, unsigned int type,
int receivemessage(int card, RspMessage *rspmsg); int receivemessage(int card, RspMessage *rspmsg);
int sc_ioctl(int card, scs_ioctl *data); int sc_ioctl(int card, scs_ioctl *data);
int setup_buffers(int card, int c); int setup_buffers(int card, int c);
void check_reset(unsigned long data); void sc_check_reset(unsigned long data);
void check_phystat(unsigned long data); void check_phystat(unsigned long data);
#endif /* CARD_H */ #endif /* CARD_H */
...@@ -344,7 +344,7 @@ int reset(int card) ...@@ -344,7 +344,7 @@ int reset(int card)
spin_lock_irqsave(&sc_adapter[card]->lock, flags); spin_lock_irqsave(&sc_adapter[card]->lock, flags);
init_timer(&sc_adapter[card]->reset_timer); init_timer(&sc_adapter[card]->reset_timer);
sc_adapter[card]->reset_timer.function = check_reset; sc_adapter[card]->reset_timer.function = sc_check_reset;
sc_adapter[card]->reset_timer.data = card; sc_adapter[card]->reset_timer.data = card;
sc_adapter[card]->reset_timer.expires = jiffies + CHECKRESET_TIME; sc_adapter[card]->reset_timer.expires = jiffies + CHECKRESET_TIME;
add_timer(&sc_adapter[card]->reset_timer); add_timer(&sc_adapter[card]->reset_timer);
......
...@@ -43,7 +43,7 @@ static void setup_ports(int card) ...@@ -43,7 +43,7 @@ static void setup_ports(int card)
* Then, check to see if the signate has been set. Next, set the * Then, check to see if the signate has been set. Next, set the
* signature to a known value and issue a startproc if needed. * signature to a known value and issue a startproc if needed.
*/ */
void check_reset(unsigned long data) void sc_check_reset(unsigned long data)
{ {
unsigned long flags; unsigned long flags;
unsigned long sig; unsigned long sig;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment