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

[pandora-kernel.git] / drivers / ata / pata_sc1200.c

diff --git a/drivers/ata/pata_sc1200.c b/drivers/ata/pata_sc1200.c
index e2c1825..c0e603a 100644 (file)
--- a/drivers/ata/pata_sc1200.c
+++ b/drivers/ata/pata_sc1200.c
@@ -38,7 +38,7 @@
 #include <scsi/scsi_host.h>
 #include <linux/libata.h>
 
-#define DRV_NAME       "sc1200"
+#define DRV_NAME       "pata_sc1200"
 #define DRV_VERSION    "0.2.6"
 
 #define SC1200_REV_A   0x00
@@ -86,10 +86,14 @@ static int sc1200_clock(void)
 static void sc1200_set_piomode(struct ata_port *ap, struct ata_device *adev)
 {
        static const u32 pio_timings[4][5] = {
-               {0x00009172, 0x00012171, 0x00020080, 0x00032010, 0x00040010},   // format0  33Mhz
-               {0xd1329172, 0x71212171, 0x30200080, 0x20102010, 0x00100010},   // format1, 33Mhz
-               {0xfaa3f4f3, 0xc23232b2, 0x513101c1, 0x31213121, 0x10211021},   // format1, 48Mhz
-               {0xfff4fff4, 0xf35353d3, 0x814102f1, 0x42314231, 0x11311131}    // format1, 66Mhz
+               /* format0, 33Mhz */
+               { 0x00009172, 0x00012171, 0x00020080, 0x00032010, 0x00040010 },
+               /* format1, 33Mhz */
+               { 0xd1329172, 0x71212171, 0x30200080, 0x20102010, 0x00100010 },
+               /* format1, 48Mhz */
+               { 0xfaa3f4f3, 0xc23232b2, 0x513101c1, 0x31213121, 0x10211021 },
+               /* format1, 66Mhz */
+               { 0xfff4fff4, 0xf35353d3, 0x814102f1, 0x42314231, 0x11311131 }
        };
 
        struct pci_dev *pdev = to_pci_dev(ap->host->dev);