summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorAlexander Viro <viro@math.psu.edu>2002-06-11 00:56:12 -0700
committerLinus Torvalds <torvalds@home.transmeta.com>2002-06-11 00:56:12 -0700
commit9437b796e361afbe642de52787cf5f7be407a3fc (patch)
tree69105962e801c3c775734bd21e9c44e4ab4b3f03 /include/linux
parent1b4199a5d8fe25d2faeaa67b79337db39b11d4c9 (diff)
[PATCH] (12/14) resync
#define DEVICE_NAME ... removed from the drivers that never use that macro.
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/blk.h3
-rw-r--r--include/linux/ide.h1
2 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/blk.h b/include/linux/blk.h
index 8d0bb5ab911f..8ec604d2f605 100644
--- a/include/linux/blk.h
+++ b/include/linux/blk.h
@@ -107,9 +107,6 @@ extern inline struct request *elv_next_request(request_queue_t *q)
#ifndef CURRENT
# define CURRENT elv_next_request(QUEUE)
#endif
-#ifndef DEVICE_NAME
-# define DEVICE_NAME "unknown"
-#endif
#ifdef DEVICE_INTR
static void (*DEVICE_INTR)(void) = NULL;
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 66d18a8e6b34..a5bb7d70bd08 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -599,7 +599,6 @@ extern int noautodma;
#define IDE_DRIVER /* Toggle some magic bits in blk.h */
#define LOCAL_END_REQUEST /* Don't generate end_request in blk.h */
#define DEVICE_NR(device) (minor(device) >> PARTN_BITS)
-#define DEVICE_NAME "ide"
#include <linux/blk.h>
extern int __ide_end_request(struct ata_device *, struct request *, int, unsigned int);