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

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Update defconfig.
  [SPARC64]: Add PCI MSI support on Niagara.
  [SPARC64] IRQ: Use irq_desc->chip_data instead of irq_desc->handler_data
  [SPARC64]: Add obppath sysfs attribute for SBUS and PCI devices.
  [PARTITION]: Add whole_disk attribute.

1 files changed, 7 insertions, 1 deletions

diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index 7a566fad3f72..2c65da7cabb2 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -20,6 +20,8 @@ enum {
         LINUX_EXTENDED_PARTITION = 0x85,
         WIN98_EXTENDED_PARTITION = 0x0f,
 
+        SUN_WHOLE_DISK = DOS_EXTENDED_PARTITION,
+
         LINUX_SWAP_PARTITION = 0x82,
         LINUX_DATA_PARTITION = 0x83,
         LINUX_LVM_PARTITION = 0x8e,
@@ -402,10 +404,14 @@ struct unixware_disklabel {
 
 #ifdef __KERNEL__
 
+#define ADDPART_FLAG_NONE       0
+#define ADDPART_FLAG_RAID       1
+#define ADDPART_FLAG_WHOLEDISK  2
+
 char *disk_name (struct gendisk *hd, int part, char *buf);
 
 extern int rescan_partitions(struct gendisk *disk, struct block_device *bdev);
-extern void add_partition(struct gendisk *, int, sector_t, sector_t);
+extern void add_partition(struct gendisk *, int, sector_t, sector_t, int);
 extern void delete_partition(struct gendisk *, int);
 
 extern struct gendisk *alloc_disk_node(int minors, int node_id);