Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6

[karo-tx-linux.git] / drivers / ide / pci / siimage.c

diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c
index 5314ec913724875743dd48a6d6b799c6293021c9..d09e74c2996ed67fe54bfd0b2f471bbda83821c9 100644 (file)
--- a/drivers/ide/pci/siimage.c
+++ b/drivers/ide/pci/siimage.c
@@ -827,7 +827,7 @@ static void __devinit init_mmio_iops_siimage(ide_hwif_t *hwif)
 
        /*
         *      Now set up the hw. We have to do this ourselves as
-        *      the MMIO layout isnt the same as the the standard port
+        *      the MMIO layout isnt the same as the standard port
         *      based I/O
         */