dasharo/linux
0
0
Fork 0
mirror of https://github.com/Dasharo/linux.git synced 2026-03-06 15:25:10 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'can/at91-sam9x5' of git://git.pengutronix.de/git/mkl/linux-2.6

Browse Source
This commit is contained in:
David S. Miller
2011-06-07 01:03:56 -07:00
parent a6b7a40786 b9e379bccd
commit cb2bad862e
2 changed files with 259 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/can/Kconfig
View File

@@ -58,9 +58,10 @@ config CAN_CALC_BITTIMING
config CAN_AT91
tristate "Atmel AT91 onchip CAN controller"
depends on CAN_DEV && ARCH_AT91SAM9263
depends on CAN_DEV && (ARCH_AT91SAM9263 || ARCH_AT91SAM9X5)
---help---
This is a driver for the SoC CAN controller in Atmel's AT91SAM9263.
This is a driver for the SoC CAN controller in Atmel's AT91SAM9263
and AT91SAM9X5 processors.
config CAN_TI_HECC
depends on CAN_DEV && ARCH_OMAP3

366
drivers/net/can/at91_can.c
View File

File diff suppressed because it is too large Load Diff