diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-05-27 22:58:20 +0200 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-05-27 22:58:20 +0200 |
| commit | d85d135d8babbc917b370f36cbc02b7b4a2f2d99 (patch) | |
| tree | 2f06e02940d87099670aa31459ad1ab41a1ca036 /drivers/input/mouse/gpio_mouse.c | |
| parent | drivers/video: fsl-diu-fb: don't initialize the THRESHOLDS registers (diff) | |
| parent | OMAPDSS: HDMI: OMAP4: Update IRQ flags for the HPD IRQ request (diff) | |
| download | linux-d85d135d8babbc917b370f36cbc02b7b4a2f2d99.tar.xz linux-d85d135d8babbc917b370f36cbc02b7b4a2f2d99.zip | |
Merge tag 'omapdss-for-3.5' of git://github.com/tomba/linux into fbdev-next
Omapdss driver changes for 3.5 merge window.
Lots of normal development commits, but perhaps most notable changes are:
* HDMI rework to properly decouple the HDMI audio part from the HDMI video part.
* Restructure omapdss core driver so that it's possible to implement device
tree support. This included changing how platform data is passed to the
drivers, changing display device registration and improving the panel driver's
ability to configure the underlying video output interface.
* Basic support for DSI packet interleaving
Diffstat (limited to 'drivers/input/mouse/gpio_mouse.c')
| -rw-r--r-- | drivers/input/mouse/gpio_mouse.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/mouse/gpio_mouse.c b/drivers/input/mouse/gpio_mouse.c index a9ad8e1402be..39fe9b737cae 100644 --- a/drivers/input/mouse/gpio_mouse.c +++ b/drivers/input/mouse/gpio_mouse.c @@ -12,9 +12,9 @@ #include <linux/module.h> #include <linux/platform_device.h> #include <linux/input-polldev.h> +#include <linux/gpio.h> #include <linux/gpio_mouse.h> -#include <asm/gpio.h> /* * Timer function which is run every scan_ms ms when the device is opened. |