Merge branches 'bugzilla-11884' and 'bugzilla-8544' into release

[linux-2.6-omap-h63xx.git] / drivers / ide / qd65xx.h

diff --git a/drivers/ide/qd65xx.h b/drivers/ide/qd65xx.h
index c83dea85e621fbba01a60fa7a000ba8269587b57..6636f9665d169e8cf3c9beabe4b0e8867314138a 100644 (file)
--- a/drivers/ide/qd65xx.h
+++ b/drivers/ide/qd65xx.h
@@ -31,8 +31,8 @@
 
 #define QD_CONFIG(hwif)                ((hwif)->config_data & 0x00ff)
 
-#define QD_TIMING(drive)       (byte)(((drive)->drive_data) & 0x00ff)
-#define QD_TIMREG(drive)       (byte)((((drive)->drive_data) & 0xff00) >> 8)
+#define QD_TIMING(drive)       (u8)(((drive)->drive_data) & 0x00ff)
+#define QD_TIMREG(drive)       (u8)((((drive)->drive_data) & 0xff00) >> 8)
 
 #define QD6500_DEF_DATA                ((QD_TIM1_PORT<<8) | (QD_ID3 ? 0x0c : 0x08))
 #define QD6580_DEF_DATA                ((QD_TIM1_PORT<<8) | (QD_ID3 ? 0x0a : 0x00))