Merge commit 'v2.6.30-rc5' into core/iommu

Merge reason: core/iommu was on an .30-rc1 base,
              update it to .30-rc5 to refresh.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/ide/ide-park.c b/drivers/ide/ide-park.c
index 9490b446519f..310d03f2b5b7 100644
--- a/drivers/ide/ide-park.c
+++ b/drivers/ide/ide-park.c
@@ -74,7 +74,8 @@ ide_startstop_t ide_do_park_unpark(ide_drive_t *drive, struct request *rq)
                 tf->lbal = 0x4c;
                 tf->lbam = 0x4e;
                 tf->lbah = 0x55;
-                cmd.tf_flags = IDE_TFLAG_TF | IDE_TFLAG_DEVICE;
+                cmd.valid.out.tf = IDE_VALID_OUT_TF | IDE_VALID_DEVICE;
+                cmd.valid.in.tf  = IDE_VALID_IN_TF  | IDE_VALID_DEVICE;
         } else          /* cmd == REQ_UNPARK_HEADS */
                 tf->command = ATA_CMD_CHK_POWER;