From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sun, 11 Feb 2007 19:37:45 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.21-rc1~274^2~234
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c827ba4cb49a30ce581201fd0ba2be77cde412c7;p=linux-2.6

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.
---

c827ba4cb49a30ce581201fd0ba2be77cde412c7
diff --cc include/linux/genhd.h
index 7a566fad3f,247734f788..2c65da7cab
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@@ -20,9 -20,9 +20,11 @@@ 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,
  	LINUX_RAID_PARTITION = 0xfd,	/* autodetect RAID partition */
  
  	SOLARIS_X86_PARTITION =	LINUX_SWAP_PARTITION,