Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e3aded3cc289113c7bc729ef4cb75e56d9aa71be
Commit:     e3aded3cc289113c7bc729ef4cb75e56d9aa71be
Parent:     7ac674f52778b95450509357435320be1d795248
Author:     Alexey Dobriyan <[EMAIL PROTECTED]>
AuthorDate: Thu Jul 19 01:49:10 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Thu Jul 19 10:04:50 2007 -0700

    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 <[EMAIL PROTECTED]>
    Cc: Karsten Keil <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 drivers/isdn/sc/card.h    |    2 +-
 drivers/isdn/sc/command.c |    2 +-
 drivers/isdn/sc/timer.c   |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/isdn/sc/card.h b/drivers/isdn/sc/card.h
index 4fbfa82..5992f63 100644
--- a/drivers/isdn/sc/card.h
+++ b/drivers/isdn/sc/card.h
@@ -125,7 +125,7 @@ int sendmessage(int card, unsigned int procid, unsigned int 
type,
 int receivemessage(int card, RspMessage *rspmsg);
 int sc_ioctl(int card, scs_ioctl *data);
 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);
 
 #endif /* CARD_H */
diff --git a/drivers/isdn/sc/command.c b/drivers/isdn/sc/command.c
index b7bb7cb..0e4969c 100644
--- a/drivers/isdn/sc/command.c
+++ b/drivers/isdn/sc/command.c
@@ -344,7 +344,7 @@ int reset(int card)
 
        spin_lock_irqsave(&sc_adapter[card]->lock, flags);
        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.expires = jiffies + CHECKRESET_TIME;
        add_timer(&sc_adapter[card]->reset_timer);
diff --git a/drivers/isdn/sc/timer.c b/drivers/isdn/sc/timer.c
index cc1b886..91fbe0d 100644
--- a/drivers/isdn/sc/timer.c
+++ b/drivers/isdn/sc/timer.c
@@ -43,7 +43,7 @@ static void setup_ports(int card)
  * Then, check to see if the signate has been set. Next, set the
  * 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 sig;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to