Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-omap-h63xx.git] / include / linux / smc91x.h

diff --git a/include/linux/smc91x.h b/include/linux/smc91x.h
index fc7682f04d89649d46a40619fa714ec7cd947530..3827b922ba1f8b2d9f688cac0e3095c747793690 100644 (file)
--- a/include/linux/smc91x.h
+++ b/include/linux/smc91x.h
@@ -5,6 +5,17 @@
 #define SMC91X_USE_16BIT (1 << 1)
 #define SMC91X_USE_32BIT (1 << 2)
 
+#define SMC91X_NOWAIT          (1 << 3)
+
+/* two bits for IO_SHIFT, let's hope later designs will keep this sane */
+#define SMC91X_IO_SHIFT_0      (0 << 4)
+#define SMC91X_IO_SHIFT_1      (1 << 4)
+#define SMC91X_IO_SHIFT_2      (2 << 4)
+#define SMC91X_IO_SHIFT_3      (3 << 4)
+#define SMC91X_IO_SHIFT(x)     (((x) >> 4) & 0x3)
+
+#define SMC91X_USE_DMA         (1 << 6)
+
 struct smc91x_platdata {
        unsigned long flags;
 };