Index: trunk/i386/libsaio/fdisk.h
===================================================================
--- trunk/i386/libsaio/fdisk.h	(revision 1369)
+++ trunk/i386/libsaio/fdisk.h	(revision 1370)
@@ -35,25 +35,25 @@
 #ifndef __LIBSAIO_FDISK_H
 #define __LIBSAIO_FDISK_H
 
-#define DISK_BLK0		0       /* blkno of boot block */
-#define DISK_BLK0SZ		512     /* size of boot block */
-#define DISK_BOOTSZ		446     /* size of boot code in boot block */
-#define DISK_SIGNATURE		0xAA55  /* signature of the boot record */
-#define FDISK_NPART		4       /* number of entries in fdisk table */
-#define FDISK_ACTIVE		0x80    /* indicator of active partition */
-#define FDISK_NEXTNAME		0xA7    /* indicator of NeXT partition */
-#define FDISK_DOS12		0x01    /* 12-bit fat < 10MB dos partition */
-#define FDISK_DOS16S		0x04    /* 16-bit fat < 32MB dos partition */
-#define FDISK_DOSEXT		0x05    /* extended dos partition */
-#define FDISK_DOS16B		0x06    /* 16-bit fat >= 32MB dos partition */
-#define FDISK_NTFS		0x07    /* NTFS partition */
-#define FDISK_SMALLFAT32	0x0b    /* FAT32 partition */
-#define FDISK_FAT32		0x0c    /* FAT32 partition */
-#define FDISK_DOS16SLBA		0x0e
-#define FDISK_LINUX		0x83
-#define FDISK_UFS		0xa8    /* Apple UFS partition */
-#define FDISK_HFS		0xaf    /* Apple HFS partition */
-#define FDISK_BOOTER		0xab    /* Apple booter partition */
+#define DISK_BLK0			0		/* blkno of boot block */
+#define DISK_BLK0SZ			512		/* size of boot block */
+#define DISK_BOOTSZ			446		/* size of boot code in boot block */
+#define DISK_SIGNATURE		0xAA55	/* signature of the boot record */
+#define FDISK_NPART			4		/* number of entries in fdisk table */
+#define FDISK_ACTIVE		0x80	/* indicator of active partition */
+#define FDISK_NEXTNAME		0xA7	/* indicator of NeXT partition */
+#define FDISK_DOS12			0x01	/* 12-bit fat < 10MB dos partition */
+#define FDISK_DOS16S		0x04	/* 16-bit fat < 32MB dos partition */
+#define FDISK_DOSEXT		0x05	/* extended dos partition */
+#define FDISK_DOS16B		0x06	/* 16-bit fat >= 32MB dos partition */
+#define FDISK_NTFS			0x07	/* NTFS partition */
+#define FDISK_SMALLFAT32	0x0b	 /* FAT32 partition */
+#define FDISK_FAT32			0x0c	/* FAT32 partition */
+#define FDISK_DOS16SLBA 	0x0e
+#define FDISK_LINUX			0x83
+#define FDISK_UFS			0xa8	/* Apple UFS partition */
+#define FDISK_HFS			0xaf	/* Apple HFS partition */
+#define FDISK_BOOTER		0xab	/* Apple booter partition */
 
 /*
  * Format of fdisk partion entry (if present).
Index: trunk/i386/libsaio/nvidia.c
===================================================================
--- trunk/i386/libsaio/nvidia.c	(revision 1369)
+++ trunk/i386/libsaio/nvidia.c	(revision 1370)
@@ -67,7 +67,7 @@
 
 #define NVIDIA_ROM_SIZE				0x10000
 #define PATCH_ROM_SUCCESS			1
-#define PATCH_ROM_SUCCESS_HAS_LVDS		2
+#define PATCH_ROM_SUCCESS_HAS_LVDS	2
 #define PATCH_ROM_FAILED			0
 #define MAX_NUM_DCB_ENTRIES			16
 #define TYPE_GROUPED				0xff
@@ -76,12 +76,12 @@
 
 const char *nvidia_compatible_0[]	=	{ "@0,compatible",	"NVDA,NVMac"	 };
 const char *nvidia_compatible_1[]	=	{ "@1,compatible",	"NVDA,NVMac"	 };
-const char *nvidia_device_type_0[]	=	{ "@0,device_type",	"display"	 };
-const char *nvidia_device_type_1[]	=	{ "@1,device_type",	"display"	 };
+const char *nvidia_device_type_0[]	=	{ "@0,device_type", "display"		 };
+const char *nvidia_device_type_1[]	=	{ "@1,device_type", "display"		 };
 const char *nvidia_device_type[]	=	{ "device_type",	"NVDA,Parent"	 };
-const char *nvidia_name_0[]		=	{ "@0,name",		"NVDA,Display-A" };
-const char *nvidia_name_1[]		=	{ "@1,name",		"NVDA,Display-B" };
-const char *nvidia_slot_name[]		=	{ "AAPL,slot-name",	"Slot-1"	 };
+const char *nvidia_name_0[]			=	{ "@0,name",		"NVDA,Display-A" };
+const char *nvidia_name_1[]			=	{ "@1,name",		"NVDA,Display-B" };
+const char *nvidia_slot_name[]		=	{ "AAPL,slot-name", "Slot-1"		 };
 
 static uint8_t default_NVCAP[]= {
 	0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x00,
Index: trunk/i386/libsaio/saio_types.h
===================================================================
--- trunk/i386/libsaio/saio_types.h	(revision 1369)
+++ trunk/i386/libsaio/saio_types.h	(revision 1370)
@@ -213,12 +213,11 @@
 };
 
 enum {
-
-	kPartitionTypeHFS     = 0xAF,
-	kPartitionTypeHPFS    = 0x07,
-	kPartitionTypeFAT16   = 0x06,
-	kPartitionTypeFAT32   = 0x0c,
-	kPartitionTypeEXT3    = 0x83
+	kPartitionTypeHFS		= 0xAF,
+	kPartitionTypeHPFS		= 0x07,
+	kPartitionTypeFAT16		= 0x06,
+	kPartitionTypeFAT32		= 0x0c,
+	kPartitionTypeEXT3		= 0x83
 };
 
 //#define BIOS_DEV_TYPE(d)	((d) & kBIOSDevTypeMask)