diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/net/can/sja1000/sja1000.h | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/net/can/sja1000/sja1000.h')
| -rw-r--r-- | drivers/net/can/sja1000/sja1000.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/can/sja1000/sja1000.h b/drivers/net/can/sja1000/sja1000.h index 302d2c763ad7..97a622b9302f 100644 --- a/drivers/net/can/sja1000/sja1000.h +++ b/drivers/net/can/sja1000/sja1000.h | |||
| @@ -50,6 +50,8 @@ | |||
| 50 | #include <linux/can/dev.h> | 50 | #include <linux/can/dev.h> |
| 51 | #include <linux/can/platform/sja1000.h> | 51 | #include <linux/can/platform/sja1000.h> |
| 52 | 52 | ||
| 53 | #define SJA1000_ECHO_SKB_MAX 1 /* the SJA1000 has one TX buffer object */ | ||
| 54 | |||
| 53 | #define SJA1000_MAX_IRQ 20 /* max. number of interrupts handled in ISR */ | 55 | #define SJA1000_MAX_IRQ 20 /* max. number of interrupts handled in ISR */ |
| 54 | 56 | ||
| 55 | /* SJA1000 registers - manual section 6.4 (Pelican Mode) */ | 57 | /* SJA1000 registers - manual section 6.4 (Pelican Mode) */ |