Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 344822
b: refs/heads/master
c: 770b6cb
h: refs/heads/master
v: v3
  • Loading branch information
Tony Lindgren authored and Linus Torvalds committed Dec 16, 2012
1 parent 0f88e23 commit 1863713
Show file tree
Hide file tree
Showing 6 changed files with 9 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: 3d59eebc5e137bd89c6351e4c70e90ba1d0dc234
refs/heads/master: 770b6cb4d21fb3e3df2a7a51e186a3c14db1ec30
1 change: 1 addition & 0 deletions trunk/drivers/bus/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ menu "Bus devices"

config OMAP_OCP2SCP
tristate "OMAP OCP2SCP DRIVER"
depends on ARCH_OMAP2PLUS
help
Driver to enable ocp2scp module which transforms ocp interface
protocol to scp protocol. In OMAP4, USB PHY is connected via
Expand Down
1 change: 1 addition & 0 deletions trunk/drivers/input/keyboard/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -544,6 +544,7 @@ config KEYBOARD_OMAP

config KEYBOARD_OMAP4
tristate "TI OMAP4+ keypad support"
depends on ARCH_OMAP2PLUS
select INPUT_MATRIXKMAP
help
Say Y here if you want to use the OMAP4+ keypad.
Expand Down
1 change: 1 addition & 0 deletions trunk/drivers/usb/phy/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ comment "USB Physical Layer drivers"

config OMAP_USB2
tristate "OMAP USB2 PHY Driver"
depends on ARCH_OMAP2PLUS
select USB_OTG_UTILS
help
Enable this to support the transceiver that is part of SOC. This
Expand Down
4 changes: 4 additions & 0 deletions trunk/drivers/video/omap2/Kconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
config OMAP2_VRFB
bool

if ARCH_OMAP2PLUS

source "drivers/video/omap2/dss/Kconfig"
source "drivers/video/omap2/omapfb/Kconfig"
source "drivers/video/omap2/displays/Kconfig"

endif
1 change: 1 addition & 0 deletions trunk/drivers/w1/masters/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ config W1_MASTER_GPIO

config HDQ_MASTER_OMAP
tristate "OMAP HDQ driver"
depends on ARCH_OMAP
help
Say Y here if you want support for the 1-wire or HDQ Interface
on an OMAP processor.
Expand Down

0 comments on commit 1863713

Please sign in to comment.