patch-2.4.11-dontuse linux/drivers/mtd/devices/doc1000.c
Next file: linux/drivers/mtd/devices/doc2000.c
Previous file: linux/drivers/mtd/devices/blkmtd.c
Back to the patch index
Back to the overall index
- Lines: 46
- Date:
Thu Oct 4 15:14:59 2001
- Orig file:
v2.4.10/linux/drivers/mtd/devices/doc1000.c
- Orig date:
Tue Jul 3 17:08:20 2001
diff -u --recursive --new-file v2.4.10/linux/drivers/mtd/devices/doc1000.c linux/drivers/mtd/devices/doc1000.c
@@ -1,6 +1,6 @@
/*======================================================================
- $Id: doc1000.c,v 1.11 2000/11/24 13:43:16 dwmw2 Exp $
+ $Id: doc1000.c,v 1.15 2001/10/02 15:05:13 dwmw2 Exp $
======================================================================*/
@@ -286,9 +286,9 @@
static inline int byte_write (volatile u_char *addr, u_char byte)
{
register u_char status;
- register u_short i = 0;
-
- do {
+ register u_short i = 0;
+
+ do {
status = readb(addr);
if (status & CSR_WR_READY)
{
@@ -510,11 +510,6 @@
}
-#if defined (MODULE) && LINUX_VERSION_CODE < 0x20211
-#define init_doc1000 init_module
-#define cleanup_doc1000 cleanup_module
-#endif
-
int __init init_doc1000(void)
{
struct mypriv *priv;
@@ -591,7 +586,10 @@
kfree(mymtd);
}
-#if LINUX_VERSION_CODE >= 0x20211
module_init(init_doc1000);
module_exit(cleanup_doc1000);
-#endif
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("David Woodhouse <dwmw2@infradead.org>");
+MODULE_DESCRIPTION("MTD driver for DiskOnChip 1000");
+
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)