diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /drivers/ata/Makefile | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
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 e439141d423e..fc936d4471d6 100644 --- a/drivers/ata/Makefile +++ b/drivers/ata/Makefile | |||
| @@ -64,6 +64,7 @@ obj-$(CONFIG_PATA_RZ1000) += pata_rz1000.o | |||
| 64 | obj-$(CONFIG_PATA_SC1200) += pata_sc1200.o | 64 | obj-$(CONFIG_PATA_SC1200) += pata_sc1200.o |
| 65 | obj-$(CONFIG_PATA_SERVERWORKS) += pata_serverworks.o | 65 | obj-$(CONFIG_PATA_SERVERWORKS) += pata_serverworks.o |
| 66 | obj-$(CONFIG_PATA_SIL680) += pata_sil680.o | 66 | obj-$(CONFIG_PATA_SIL680) += pata_sil680.o |
| 67 | obj-$(CONFIG_PATA_TOSHIBA) += pata_piccolo.o | ||
| 67 | obj-$(CONFIG_PATA_VIA) += pata_via.o | 68 | obj-$(CONFIG_PATA_VIA) += pata_via.o |
| 68 | obj-$(CONFIG_PATA_WINBOND) += pata_sl82c105.o | 69 | obj-$(CONFIG_PATA_WINBOND) += pata_sl82c105.o |
| 69 | obj-$(CONFIG_PATA_WINBOND_VLB) += pata_winbond.o | 70 | obj-$(CONFIG_PATA_WINBOND_VLB) += pata_winbond.o |