diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-02 22:22:54 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-02 22:22:54 -0400 |
| commit | a16b4bcd31a73a81b6d2b8ffa6b5f6ed01cf6d64 (patch) | |
| tree | 870f95ae22f423e60f4518fd38ab8e0649769991 /drivers/ide/arm/Makefile | |
| parent | 15895b932b8a047a1db7006a4f9ca74485d5a826 (diff) | |
| parent | 4283e1babe167e0ba856bb5d039465358e90785c (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
ide: fix /proc/ide/ide?/mate reporting
Revert "BAST: Remove old IDE driver"
Diffstat (limited to 'drivers/ide/arm/Makefile')
| -rw-r--r-- | drivers/ide/arm/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ide/arm/Makefile b/drivers/ide/arm/Makefile index 5bc26053afa6..936e7b0237f5 100644 --- a/drivers/ide/arm/Makefile +++ b/drivers/ide/arm/Makefile | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | 1 | ||
| 2 | obj-$(CONFIG_BLK_DEV_IDE_ICSIDE) += icside.o | 2 | obj-$(CONFIG_BLK_DEV_IDE_ICSIDE) += icside.o |
| 3 | obj-$(CONFIG_BLK_DEV_IDE_RAPIDE) += rapide.o | 3 | obj-$(CONFIG_BLK_DEV_IDE_RAPIDE) += rapide.o |
| 4 | obj-$(CONFIG_BLK_DEV_IDE_BAST) += bast-ide.o | ||
| 4 | obj-$(CONFIG_BLK_DEV_PALMCHIP_BK3710) += palm_bk3710.o | 5 | obj-$(CONFIG_BLK_DEV_PALMCHIP_BK3710) += palm_bk3710.o |
| 5 | 6 | ||
| 6 | ifeq ($(CONFIG_IDE_ARM), m) | 7 | ifeq ($(CONFIG_IDE_ARM), m) |