aboutsummaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-14 12:29:14 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-14 12:29:14 -0700
commit3ec2ab5514dbd6b5c4c3437c6a3cd9e5a90e84ef (patch)
tree44225691130bac645c033db1f80cc083597f1bb3 /include/linux
parent200cfbb36ce360f7943c62b6c09885c215bfc1f5 (diff)
parent90e07d9f54c61449dd48eff82e2354d0124d4f7e (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc: pxamci: fix PXA27x MMC workaround for bad CRC with 136 bit response mmc: use assigned major for block device sdhci: handle dma boundary interrupts mmc: au1xmmc command types check from data flags
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/major.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/major.h b/include/linux/major.h
index 0a74c52924c..7e7c9093919 100644
--- a/include/linux/major.h
+++ b/include/linux/major.h
@@ -152,6 +152,8 @@
#define USB_ACM_AUX_MAJOR 167
#define USB_CHAR_MAJOR 180
+#define MMC_BLOCK_MAJOR 179
+
#define VXVM_MAJOR 199 /* VERITAS volume i/o driver */
#define VXSPEC_MAJOR 200 /* VERITAS volume config driver */
#define VXDMP_MAJOR 201 /* VERITAS volume multipath driver */