diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-12-15 18:35:24 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-12-15 18:35:24 -0500 |
| commit | 2a1e1379bae53f647c463a677cc2ec71b591c348 (patch) | |
| tree | a152beb5e8679e94430c5b47bf798dd8a2d4fd5d /drivers/ide/mips/Makefile | |
| parent | 787926b1b2d21d42ca462dc736b77f1a4a30c503 (diff) | |
| parent | 7b6666530e2736f190a2629c8abe34275054449f (diff) | |
Merge by hand (conflicts in scsi_lib.c)
This merge is pretty extensive. The conflict is over the new
req->retries parameter, so I had to change the prototype to
scsi_setup_blk_pc_cmnd() and the usage in sd, sr and st.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/ide/mips/Makefile')
| -rw-r--r-- | drivers/ide/mips/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/ide/mips/Makefile b/drivers/ide/mips/Makefile index 578e52a59588..677c7b2bac92 100644 --- a/drivers/ide/mips/Makefile +++ b/drivers/ide/mips/Makefile | |||
| @@ -1 +1,4 @@ | |||
| 1 | obj-$(CONFIG_BLK_DEV_IDE_SWARM) += swarm.o | 1 | obj-$(CONFIG_BLK_DEV_IDE_SWARM) += swarm.o |
| 2 | obj-$(CONFIG_BLK_DEV_IDE_AU1XXX) += au1xxx-ide.o | ||
| 3 | |||
| 4 | EXTRA_CFLAGS := -Idrivers/ide | ||