diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-26 15:30:40 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-26 15:30:40 +0200 |
| commit | 1503af661947b7a4a09355cc2ae6aa0d43f16776 (patch) | |
| tree | 5bfcfadf2dd2d98c2ad251c96d7ee43a6903819a /drivers/char/mwave/tp3780i.c | |
| parent | a31863168660c6b6f6c7ffe05bb6a38e97803326 (diff) | |
| parent | 024e8ac04453b3525448c31ef39848cf675ba6db (diff) | |
Merge branch 'linus' into x86/header-guards
Conflicts:
include/asm-x86/gpio.h
include/asm-x86/ide.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/char/mwave/tp3780i.c')
| -rw-r--r-- | drivers/char/mwave/tp3780i.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/char/mwave/tp3780i.c b/drivers/char/mwave/tp3780i.c index f282976daaa..c6896970806 100644 --- a/drivers/char/mwave/tp3780i.c +++ b/drivers/char/mwave/tp3780i.c @@ -57,8 +57,6 @@ #include "3780i.h" #include "mwavepub.h" -extern MWAVE_DEVICE_DATA mwave_s_mdd; - static unsigned short s_ausThinkpadIrqToField[16] = { 0xFFFF, 0xFFFF, 0xFFFF, 0x0001, 0x0002, 0x0003, 0xFFFF, 0x0004, 0xFFFF, 0xFFFF, 0x0005, 0x0006, 0xFFFF, 0xFFFF, 0xFFFF, 0x0007 }; |