diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
| commit | 8a87a0b6313109d2fea87b1271d497c954ce2ca8 (patch) | |
| tree | 1b7ae51ff681e27118590e9cab4bf0ce38f5d80e /drivers/ide/pci/Makefile | |
| parent | e6a04466ba965875a6132700fabb2f2c0249c41a (diff) | |
| parent | 3b44f137b9a846c5452d9e6e1271b79b1dbcc942 (diff) | |
Merge by hand (whitespace conflicts in libata.h)
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/ide/pci/Makefile')
| -rw-r--r-- | drivers/ide/pci/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ide/pci/Makefile b/drivers/ide/pci/Makefile index af46226c1796..f35d684edc25 100644 --- a/drivers/ide/pci/Makefile +++ b/drivers/ide/pci/Makefile | |||
| @@ -6,6 +6,7 @@ obj-$(CONFIG_BLK_DEV_ATIIXP) += atiixp.o | |||
| 6 | obj-$(CONFIG_BLK_DEV_CMD64X) += cmd64x.o | 6 | obj-$(CONFIG_BLK_DEV_CMD64X) += cmd64x.o |
| 7 | obj-$(CONFIG_BLK_DEV_CS5520) += cs5520.o | 7 | obj-$(CONFIG_BLK_DEV_CS5520) += cs5520.o |
| 8 | obj-$(CONFIG_BLK_DEV_CS5530) += cs5530.o | 8 | obj-$(CONFIG_BLK_DEV_CS5530) += cs5530.o |
| 9 | obj-$(CONFIG_BLK_DEV_CS5535) += cs5535.o | ||
| 9 | obj-$(CONFIG_BLK_DEV_SC1200) += sc1200.o | 10 | obj-$(CONFIG_BLK_DEV_SC1200) += sc1200.o |
| 10 | obj-$(CONFIG_BLK_DEV_CY82C693) += cy82c693.o | 11 | obj-$(CONFIG_BLK_DEV_CY82C693) += cy82c693.o |
| 11 | obj-$(CONFIG_BLK_DEV_HPT34X) += hpt34x.o | 12 | obj-$(CONFIG_BLK_DEV_HPT34X) += hpt34x.o |