summaryrefslogtreecommitdiffstats
path: root/include/asm-sparc
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-01-27 02:49:43 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-01-27 02:49:43 +0000
commit56667aa92bc7769441077266554d158bb6a481e7 (patch)
tree118e15716a895f1270739140f7c607a3daf26df7 /include/asm-sparc
parent8bf5495b875d2d4674f825c6cc17c5686e236061 (diff)
Cleanup.
Diffstat (limited to 'include/asm-sparc')
-rw-r--r--include/asm-sparc/floppy.h32
-rw-r--r--include/asm-sparc/param.h1
2 files changed, 15 insertions, 18 deletions
diff --git a/include/asm-sparc/floppy.h b/include/asm-sparc/floppy.h
index a8e415dbd..9b76a32c4 100644
--- a/include/asm-sparc/floppy.h
+++ b/include/asm-sparc/floppy.h
@@ -59,23 +59,21 @@ struct sun_floppy_ops {
static struct sun_floppy_ops sun_fdops;
-#define fd_inb(port) sun_fdops.fd_inb(port)
-#define fd_outb(value,port) sun_fdops.fd_outb(value,port)
-
-#define fd_enable_dma(channel) sun_fd_enable_dma()
-#define fd_disable_dma(channel) sun_fd_disable_dma()
-#define fd_request_dma(channel) (0) /* nothing... */
-#define fd_free_dma(channel) /* nothing... */
-#define fd_clear_dma_ff(channel) /* nothing... */
-#define fd_set_dma_mode(channel,mode) sun_fd_set_dma_mode(mode)
-#define fd_set_dma_addr(channel,addr) sun_fd_set_dma_addr(addr)
-#define fd_set_dma_count(channel,count) sun_fd_set_dma_count(count)
-
-#define fd_enable_irq(irq) /* nothing... */
-#define fd_disable_irq(irq) /* nothing... */
-#define fd_request_irq(irq) sun_fd_request_irq()
-#define fd_free_irq(irq) /* nothing... */
-
+#define fd_inb(port) sun_fdops.fd_inb(port)
+#define fd_outb(value,port) sun_fdops.fd_outb(value,port)
+#define fd_enable_dma() sun_fd_enable_dma()
+#define fd_disable_dma() sun_fd_disable_dma()
+#define fd_request_dma() (0) /* nothing... */
+#define fd_free_dma() /* nothing... */
+#define fd_clear_dma_ff() /* nothing... */
+#define fd_set_dma_mode(mode) sun_fd_set_dma_mode(mode)
+#define fd_set_dma_addr(addr) sun_fd_set_dma_addr(addr)
+#define fd_set_dma_count(count) sun_fd_set_dma_count(count)
+#define fd_enable_irq() /* nothing... */
+#define fd_disable_irq() /* nothing... */
+#define fd_cacheflush(addr, size) /* nothing... */
+#define fd_request_irq() sun_fd_request_irq()
+#define fd_free_irq() /* nothing... */
#if 0 /* P3: added by Alain, these cause a MMU corruption. 19960524 XXX */
#define fd_dma_mem_alloc(size) ((unsigned long) vmalloc(size))
#define fd_dma_mem_free(addr,size) (vfree((void *)(addr)))
diff --git a/include/asm-sparc/param.h b/include/asm-sparc/param.h
index 639675feb..7e14a410e 100644
--- a/include/asm-sparc/param.h
+++ b/include/asm-sparc/param.h
@@ -4,7 +4,6 @@
#ifndef HZ
#define HZ 100
-#define HZ_TO_STD(a) (a)
#endif
#define EXEC_PAGESIZE 8192 /* Thanks for sun4's we carry baggage... */