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

cb2bad86 · David S. Miller · a6b7a407 · b9e379bc · cb2bad86 · cb2bad86
Commit cb2bad86 authored Jun 07, 2011 by David S. Miller
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 259 additions and 112 deletions

drivers/net/can/Kconfig drivers/net/can/Kconfig +3 -2

drivers/net/can/at91_can.c drivers/net/can/at91_can.c +256 -110

No files found.
--- a/drivers/net/can/Kconfig
+++ b/drivers/net/can/Kconfig
@@ -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

--- a/drivers/net/can/at91_can.c
+++ b/drivers/net/can/at91_can.c