diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-22 21:22:42 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-22 21:22:42 -0400 |
| commit | 76fef2b6bffa13ad7ccd54c0493b053295721b9a (patch) | |
| tree | f4509477d413398b7155fb3c35453ab26bd81bce /include | |
| parent | 817bc4db7794d6dc6594265ddea88d2b839cf2f8 (diff) | |
| parent | ef8500457b29eed13d03ff19af36d810308e57b7 (diff) | |
Merge branch 'upstream-net26' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Conflicts:
drivers/s390/net/qeth_main.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/smc91x.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/include/linux/smc91x.h b/include/linux/smc91x.h new file mode 100644 index 000000000000..8e0556b8781c --- /dev/null +++ b/include/linux/smc91x.h | |||
| @@ -0,0 +1,13 @@ | |||
| 1 | #ifndef __SMC91X_H__ | ||
| 2 | #define __SMC91X_H__ | ||
| 3 | |||
| 4 | #define SMC91X_USE_8BIT (1 << 0) | ||
| 5 | #define SMC91X_USE_16BIT (1 << 1) | ||
| 6 | #define SMC91X_USE_32BIT (1 << 2) | ||
| 7 | |||
| 8 | struct smc91x_platdata { | ||
| 9 | unsigned long flags; | ||
| 10 | unsigned long irq_flags; /* IRQF_... */ | ||
| 11 | }; | ||
| 12 | |||
| 13 | #endif /* __SMC91X_H__ */ | ||