diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-01-17 00:17:58 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-01-17 00:17:58 -0500 |
| commit | 52920df4aa9dd25836b8ed4dc0b177ea14c09e53 (patch) | |
| tree | 47b3fab4849f7faeaaf88e2ca8dcc911a0c39103 /drivers/ata/Makefile | |
| parent | 0173d422aa32fa1e5141f1759202b955215c1da2 (diff) | |
| parent | 9cd55be4d22376893d2818ce3c0e5706a3d74121 (diff) | |
Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/olof/pasemi into for-2.6.25
Diffstat (limited to 'drivers/ata/Makefile')
| -rw-r--r-- | drivers/ata/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile index b13feb2c5dae..ebcee64dd5e2 100644 --- a/drivers/ata/Makefile +++ b/drivers/ata/Makefile | |||
| @@ -67,6 +67,7 @@ obj-$(CONFIG_PATA_IXP4XX_CF) += pata_ixp4xx_cf.o | |||
| 67 | obj-$(CONFIG_PATA_SCC) += pata_scc.o | 67 | obj-$(CONFIG_PATA_SCC) += pata_scc.o |
| 68 | obj-$(CONFIG_PATA_BF54X) += pata_bf54x.o | 68 | obj-$(CONFIG_PATA_BF54X) += pata_bf54x.o |
| 69 | obj-$(CONFIG_PATA_PLATFORM) += pata_platform.o | 69 | obj-$(CONFIG_PATA_PLATFORM) += pata_platform.o |
| 70 | obj-$(CONFIG_PATA_OF_PLATFORM) += pata_of_platform.o | ||
| 70 | obj-$(CONFIG_PATA_ICSIDE) += pata_icside.o | 71 | obj-$(CONFIG_PATA_ICSIDE) += pata_icside.o |
| 71 | # Should be last but two libata driver | 72 | # Should be last but two libata driver |
| 72 | obj-$(CONFIG_PATA_ACPI) += pata_acpi.o | 73 | obj-$(CONFIG_PATA_ACPI) += pata_acpi.o |