diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-05 08:59:37 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-05 08:59:37 -0400 |
| commit | bfd4bda097f8758d28e632ff2035e25577f6b060 (patch) | |
| tree | 022276b3625a432c7132e39776e7e448445087ac /include/asm-sparc/floppy.h | |
| parent | 488f2eaca1b0831a5a5e6a66e33bad2cdeff7238 (diff) | |
| parent | b2d84f078a8be40f5ae3b4d2ac001e2a7f45fe4f (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-sparc/floppy.h')
| -rw-r--r-- | include/asm-sparc/floppy.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sparc/floppy.h b/include/asm-sparc/floppy.h index 780ee7ff9dc3..caf926116506 100644 --- a/include/asm-sparc/floppy.h +++ b/include/asm-sparc/floppy.h | |||
| @@ -227,7 +227,7 @@ static __inline__ void sun_fd_disable_dma(void) | |||
| 227 | doing_pdma = 0; | 227 | doing_pdma = 0; |
| 228 | if (pdma_base) { | 228 | if (pdma_base) { |
| 229 | mmu_unlockarea(pdma_base, pdma_areasize); | 229 | mmu_unlockarea(pdma_base, pdma_areasize); |
| 230 | pdma_base = 0; | 230 | pdma_base = NULL; |
| 231 | } | 231 | } |
| 232 | } | 232 | } |
| 233 | 233 | ||