summaryrefslogtreecommitdiffstats
path: root/include/linux/ide.h
diff options
context:
space:
mode:
authorLachlan McIlroy <lachlan@redback.melbourne.sgi.com>2009-01-19 14:00:57 +1100
committerLachlan McIlroy <lachlan@sgi.com>2009-01-19 14:00:57 +1100
commit6c5200ce3c528a8f7695ee62f33ad84d8f84d444 (patch)
treeb240465c2dadbe0366a5b66d60c4776be1b7670d /include/linux/ide.h
parent9d87c3192d96ef9ac1cec8321538e9b35e90b5aa (diff)
parentf3b8436ad9a8ad36b3c9fa1fe030c7f38e5d3d0b (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/ide.h')
-rw-r--r--include/linux/ide.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 3644f632338..194da5a4b0d 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -871,7 +871,7 @@ struct ide_host {
ide_hwif_t *cur_port; /* for hosts requiring serialization */
/* used for hosts requiring serialization */
- volatile long host_busy;
+ volatile unsigned long host_busy;
};
#define IDE_HOST_BUSY 0