diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-08-02 03:19:14 -0400 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-08-03 17:08:42 -0400 |
| commit | 0a808a3131b2a6656475d82219f5e5d25edd7160 (patch) | |
| tree | 12a4f0690bf01ccc9956ba974dd64237ee9f807c /arch/sparc/kernel/entry.S | |
| parent | 3daadf33013a1c4d7abf4a65b24644cdd8ae896a (diff) | |
[SPARC32]: Fix modular build of floppy driver.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel/entry.S')
| -rw-r--r-- | arch/sparc/kernel/entry.S | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/sparc/kernel/entry.S b/arch/sparc/kernel/entry.S index eac38388f5fd..88d2cefd01be 100644 --- a/arch/sparc/kernel/entry.S +++ b/arch/sparc/kernel/entry.S | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | /* $Id: entry.S,v 1.170 2001/11/13 00:57:05 davem Exp $ | 1 | /* arch/sparc/kernel/entry.S: Sparc trap low-level entry points. |
| 2 | * arch/sparc/kernel/entry.S: Sparc trap low-level entry points. | ||
| 3 | * | 2 | * |
| 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 3 | * Copyright (C) 1995, 2007 David S. Miller (davem@davemloft.net) |
| 5 | * Copyright (C) 1996 Eddie C. Dost (ecd@skynet.be) | 4 | * Copyright (C) 1996 Eddie C. Dost (ecd@skynet.be) |
| 6 | * Copyright (C) 1996 Miguel de Icaza (miguel@nuclecu.unam.mx) | 5 | * Copyright (C) 1996 Miguel de Icaza (miguel@nuclecu.unam.mx) |
| 7 | * Copyright (C) 1996-1999 Jakub Jelinek (jj@sunsite.mff.cuni.cz) | 6 | * Copyright (C) 1996-1999 Jakub Jelinek (jj@sunsite.mff.cuni.cz) |
| @@ -129,7 +128,7 @@ trap_low: | |||
| 129 | RESTORE_ALL | 128 | RESTORE_ALL |
| 130 | #endif | 129 | #endif |
| 131 | 130 | ||
| 132 | #ifdef CONFIG_BLK_DEV_FD | 131 | #if defined(CONFIG_BLK_DEV_FD) || defined(CONFIG_BLK_DEV_FD_MODULE) |
| 133 | .text | 132 | .text |
| 134 | .align 4 | 133 | .align 4 |
| 135 | .globl floppy_hardint | 134 | .globl floppy_hardint |