---

yaml --- r: 175816 b: refs/heads/master c: 88358ab h: refs/heads/master v: v3
git-mirror · Dec 9, 2009 · 87ee054 · 87ee054
1 parent 3d90768
commit 87ee054
Show file tree

Hide file tree

Showing 4 changed files with 1,439 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f0353813afe784330622596ff141e7525ccd99de
+refs/heads/master: 88358ab08944da726e948d216977ad499dfc15c6
diff --git a/trunk/drivers/ata/Kconfig b/trunk/drivers/ata/Kconfig
@@ -781,5 +781,15 @@ config PATA_BF54X
 
 	  If unsure, say N.
 
+config PATA_MACIO
+	tristate "Apple PowerMac/PowerBook internal 'MacIO' IDE"
+	depends on PPC_PMAC
+	help
+	  Most IDE capable PowerMacs have IDE busses driven by a variant
+          of this controller which is part of the Apple chipset used on
+          most PowerMac models. Some models have multiple busses using
+          different chipsets, though generally, MacIO is one of them.
+
+
 endif # ATA_SFF
 endif # ATA
diff --git a/trunk/drivers/ata/Makefile b/trunk/drivers/ata/Makefile
@@ -18,6 +18,7 @@ obj-$(CONFIG_SATA_MV)		+= sata_mv.o
 obj-$(CONFIG_SATA_INIC162X)	+= sata_inic162x.o
 obj-$(CONFIG_PDC_ADMA)		+= pdc_adma.o
 obj-$(CONFIG_SATA_FSL)		+= sata_fsl.o
+obj-$(CONFIG_PATA_MACIO)	+= pata_macio.o
 
 obj-$(CONFIG_PATA_ALI)		+= pata_ali.o
 obj-$(CONFIG_PATA_AMD)		+= pata_amd.o