Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 218368
b: refs/heads/master
c: b21d18b
h: refs/heads/master
v: v3
  • Loading branch information
Masayuki Ohtake authored and David S. Miller committed Oct 24, 2010
1 parent 31b7343 commit d6f3664
Show file tree
Hide file tree
Showing 4 changed files with 1,473 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6cebb17beece746de86793cd549e84740896cf4a
refs/heads/master: b21d18b51b31a24d17f883b678432fbdee3d5675
8 changes: 8 additions & 0 deletions trunk/drivers/net/can/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,14 @@ config CAN_FLEXCAN
---help---
Say Y here if you want to support for Freescale FlexCAN.

config PCH_CAN
tristate "PCH CAN"
depends on CAN_DEV
---help---
This driver is for PCH CAN of Topcliff which is an IOH for x86
embedded processor.
This driver can access CAN bus.

source "drivers/net/can/mscan/Kconfig"

source "drivers/net/can/sja1000/Kconfig"
Expand Down
1 change: 1 addition & 0 deletions trunk/drivers/net/can/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@ obj-$(CONFIG_CAN_MCP251X) += mcp251x.o
obj-$(CONFIG_CAN_BFIN) += bfin_can.o
obj-$(CONFIG_CAN_JANZ_ICAN3) += janz-ican3.o
obj-$(CONFIG_CAN_FLEXCAN) += flexcan.o
obj-$(CONFIG_PCH_CAN) += pch_can.o

ccflags-$(CONFIG_CAN_DEBUG_DEVICES) := -DDEBUG
Loading

0 comments on commit d6f3664

Please sign in to comment.