Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-drm-fsl-dcu.git] / include / linux / genhd.h

diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index 247734f7881fdd98d5b84ed3fb8415445a97b8fe..2c65da7cabb2a25acc1c42c067a3770872f29141 100644 (file)
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -23,6 +23,8 @@ enum {
        SUN_WHOLE_DISK = DOS_EXTENDED_PARTITION,
 
        LINUX_SWAP_PARTITION = 0x82,
+       LINUX_DATA_PARTITION = 0x83,
+       LINUX_LVM_PARTITION = 0x8e,
        LINUX_RAID_PARTITION = 0xfd,    /* autodetect RAID partition */
 
        SOLARIS_X86_PARTITION = LINUX_SWAP_PARTITION,