summaryrefslogtreecommitdiff
path: root/include/linux/miscdevice.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@penguin.transmeta.com>2003-01-14 01:08:14 -0800
committerLinus Torvalds <torvalds@penguin.transmeta.com>2003-01-14 01:08:14 -0800
commit200ce8b3fe4fa22d95da992de667a9097c97c529 (patch)
treea11a303e9a7da68e21cb3deb09a84c6d24140896 /include/linux/miscdevice.h
parent9f9618b6ae0025f394834c6ec53a37baed5cdeb7 (diff)
parent1105415188b0cf41e28c0145e827b60a975e45d7 (diff)
Merge http://fbdev.bkbits.net:8080/fbdev-2.5
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
Diffstat (limited to 'include/linux/miscdevice.h')
-rw-r--r--include/linux/miscdevice.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h
index 396d4178b14c..b7b3da409f8a 100644
--- a/include/linux/miscdevice.h
+++ b/include/linux/miscdevice.h
@@ -18,6 +18,7 @@
#define RTC_MINOR 135
#define EFI_RTC_MINOR 136 /* EFI Time services */
#define SUN_OPENPROM_MINOR 139
+#define DMAPI_MINOR 140 /* DMAPI */
#define NVRAM_MINOR 144
#define I2O_MINOR 166
#define MICROCODE_MINOR 184