Merge branch 'can/at91-sam9x5' of git://git.pengutronix.de/git/mkl/li…

…nux-2.6
git-mirror · Jun 7, 2011 · cb2bad8 · cb2bad8
2 parents a6b7a40 + b9e379b
commit cb2bad8
Show file tree

Hide file tree

Showing 2 changed files with 259 additions and 112 deletions.
diff --git 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