diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-13 07:05:49 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-13 07:05:49 -0400 |
| commit | 044e5f45e4ad890d03bd1e8bb44c634397cac24d (patch) | |
| tree | a6063f77bd719d933823915d2273eaadb6331611 /include/linux/smc91x.h | |
| parent | f0006314d37639714da9658cf4ff3f1f9f420764 (diff) | |
| parent | faf64ed4968e354624f330c6da6c1ce8b05a0713 (diff) | |
Merge branch 'pxa' into devel
Conflicts:
arch/arm/configs/em_x270_defconfig
arch/arm/configs/xm_x270_defconfig
Diffstat (limited to 'include/linux/smc91x.h')
| -rw-r--r-- | include/linux/smc91x.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/include/linux/smc91x.h b/include/linux/smc91x.h index 8e0556b8781c..3827b922ba1f 100644 --- a/include/linux/smc91x.h +++ b/include/linux/smc91x.h | |||
| @@ -5,9 +5,19 @@ | |||
| 5 | #define SMC91X_USE_16BIT (1 << 1) | 5 | #define SMC91X_USE_16BIT (1 << 1) |
| 6 | #define SMC91X_USE_32BIT (1 << 2) | 6 | #define SMC91X_USE_32BIT (1 << 2) |
| 7 | 7 | ||
| 8 | #define SMC91X_NOWAIT (1 << 3) | ||
| 9 | |||
| 10 | /* two bits for IO_SHIFT, let's hope later designs will keep this sane */ | ||
| 11 | #define SMC91X_IO_SHIFT_0 (0 << 4) | ||
| 12 | #define SMC91X_IO_SHIFT_1 (1 << 4) | ||
| 13 | #define SMC91X_IO_SHIFT_2 (2 << 4) | ||
| 14 | #define SMC91X_IO_SHIFT_3 (3 << 4) | ||
| 15 | #define SMC91X_IO_SHIFT(x) (((x) >> 4) & 0x3) | ||
| 16 | |||
| 17 | #define SMC91X_USE_DMA (1 << 6) | ||
| 18 | |||
| 8 | struct smc91x_platdata { | 19 | struct smc91x_platdata { |
| 9 | unsigned long flags; | 20 | unsigned long flags; |
| 10 | unsigned long irq_flags; /* IRQF_... */ | ||
| 11 | }; | 21 | }; |
| 12 | 22 | ||
| 13 | #endif /* __SMC91X_H__ */ | 23 | #endif /* __SMC91X_H__ */ |