Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
92944c1c
Commit
92944c1c
authored
Sep 05, 2010
by
Dmitry Torokhov
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'mrst-touchscreen' into next
Conflicts: drivers/input/touchscreen/Makefile
parents
77686517
d4f5f937
Changes
8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
700 additions
and
15 deletions
+700
-15
drivers/input/touchscreen/Kconfig
drivers/input/touchscreen/Kconfig
+12
-0
drivers/input/touchscreen/Makefile
drivers/input/touchscreen/Makefile
+1
-0
drivers/input/touchscreen/intel-mid-touch.c
drivers/input/touchscreen/intel-mid-touch.c
+687
-0
drivers/staging/Kconfig
drivers/staging/Kconfig
+0
-2
drivers/staging/Makefile
drivers/staging/Makefile
+0
-1
drivers/staging/mrst-touchscreen/Kconfig
drivers/staging/mrst-touchscreen/Kconfig
+0
-7
drivers/staging/mrst-touchscreen/Makefile
drivers/staging/mrst-touchscreen/Makefile
+0
-3
drivers/staging/mrst-touchscreen/TODO
drivers/staging/mrst-touchscreen/TODO
+0
-2
No files found.
drivers/input/touchscreen/Kconfig
View file @
92944c1c
...
...
@@ -260,6 +260,18 @@ config TOUCHSCREEN_INEXIO
To compile this driver as a module, choose M here: the
module will be called inexio.
config TOUCHSCREEN_INTEL_MID
tristate "Intel MID platform resistive touchscreen"
depends on INTEL_SCU_IPC
help
Say Y here if you have a Intel MID based touchscreen in
your system.
If unsure, say N.
To compile this driver as a module, choose M here: the
module will be called intel_mid_touch.
config TOUCHSCREEN_MK712
tristate "ICS MicroClock MK712 touchscreen"
help
...
...
drivers/input/touchscreen/Makefile
View file @
92944c1c
...
...
@@ -23,6 +23,7 @@ obj-$(CONFIG_TOUCHSCREEN_EETI) += eeti_ts.o
obj-$(CONFIG_TOUCHSCREEN_ELO)
+=
elo.o
obj-$(CONFIG_TOUCHSCREEN_FUJITSU)
+=
fujitsu_ts.o
obj-$(CONFIG_TOUCHSCREEN_INEXIO)
+=
inexio.o
obj-$(CONFIG_TOUCHSCREEN_INTEL_MID)
+=
intel-mid-touch.o
obj-$(CONFIG_TOUCHSCREEN_LPC32XX)
+=
lpc32xx_ts.o
obj-$(CONFIG_TOUCHSCREEN_MC13783)
+=
mc13783_ts.o
obj-$(CONFIG_TOUCHSCREEN_MCS5000)
+=
mcs5000_ts.o
...
...
drivers/
staging/mrst-
touchscreen/intel-mid-touch.c
→
drivers/
input/
touchscreen/intel-mid-touch.c
View file @
92944c1c
This diff is collapsed.
Click to expand it.
drivers/staging/Kconfig
View file @
92944c1c
...
...
@@ -141,8 +141,6 @@ source "drivers/staging/adis16255/Kconfig"
source "drivers/staging/xgifb/Kconfig"
source "drivers/staging/mrst-touchscreen/Kconfig"
source "drivers/staging/msm/Kconfig"
source "drivers/staging/lirc/Kconfig"
...
...
drivers/staging/Makefile
View file @
92944c1c
...
...
@@ -52,7 +52,6 @@ obj-$(CONFIG_CXT1E1) += cxt1e1/
obj-$(CONFIG_TI_ST)
+=
ti-st/
obj-$(CONFIG_ADIS16255)
+=
adis16255/
obj-$(CONFIG_FB_XGI)
+=
xgifb/
obj-$(CONFIG_TOUCHSCREEN_MRSTOUCH)
+=
mrst-touchscreen/
obj-$(CONFIG_MSM_STAGING)
+=
msm/
obj-$(CONFIG_EASYCAP)
+=
easycap/
obj-$(CONFIG_SOLO6X10)
+=
solo6x10/
...
...
drivers/staging/mrst-touchscreen/Kconfig
deleted
100644 → 0
View file @
77686517
config TOUCHSCREEN_INTEL_MID
tristate "Intel MID platform resistive touchscreen"
depends on INTEL_SCU_IPC
default y
help
Say Y here if you have a Intel MID based touchscreen
If unsure, say N.
drivers/staging/mrst-touchscreen/Makefile
deleted
100644 → 0
View file @
77686517
obj-$(CONFIG_TOUCHSCREEN_INTEL_MID)
:=
intel_mid_touch.o
drivers/staging/mrst-touchscreen/TODO
deleted
100644 → 0
View file @
77686517
- Move the driver to not think it is SPI (requires fixing some of the SFI
and firmware side)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment