summaryrefslogtreecommitdiff
path: root/include/linux/blkdev.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@athlon.transmeta.com>2002-02-04 23:59:46 -0800
committerLinus Torvalds <torvalds@athlon.transmeta.com>2002-02-04 23:59:46 -0800
commita914dd8b3b9ee9ccb2659b55fc98933c9f2a9c73 (patch)
treee6c0b33fa9cb9e04c00fc0ca11763e67be7c7c15 /include/linux/blkdev.h
parentba6edf537004b1c68a0736c95ebe39a30a2537fb (diff)
v2.5.1.5 -> v2.5.1.6
- Davide Libenzi: nicer timeslices for scheduler - Arnaldo: wd7000 scsi driver cleanups and bio update - Greg KH: USB update (including initial 2.0 support) - me: strict typechecking on "kdev_t"
Diffstat (limited to 'include/linux/blkdev.h')
-rw-r--r--include/linux/blkdev.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index d084e28ef4b9..8c3033d1dd68 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -371,10 +371,10 @@ extern inline unsigned int blksize_bits(unsigned int size)
extern inline unsigned int block_size(kdev_t dev)
{
int retval = BLOCK_SIZE;
- int major = MAJOR(dev);
+ int major = major(dev);
if (blksize_size[major]) {
- int minor = MINOR(dev);
+ int minor = minor(dev);
if (blksize_size[major][minor])
retval = blksize_size[major][minor];
}