[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-229-g9cba19a
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-229-g9cba19a
|
From: Fabien M <fa...@us...> - 2011-01-11 09:04:26
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 9cba19ad137f1e07ffb390f70022fff6492868a0 (commit)
from 6b1e43509efefc895681979b7499bf35fa3d7543 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9cba19ad137f1e07ffb390f70022fff6492868a0
Author: Fabien Marteau <fab...@ar...>
Date: Tue Jan 11 10:03:41 2011 +0100
[LINUX] Fix bug in patch 359-as5011
-----------------------------------------------------------------------
Summary of changes:
...us-joystick-adding_as5011_joystick_driver.patch | 47 ++++++++++---------
1 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/359-armadeus-joystick-adding_as5011_joystick_driver.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/359-armadeus-joystick-adding_as5011_joystick_driver.patch
index ac0ae97..7994052 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/359-armadeus-joystick-adding_as5011_joystick_driver.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/359-armadeus-joystick-adding_as5011_joystick_driver.patch
@@ -5,7 +5,7 @@ Signed-off-by: Fabien Marteau <fab...@ar...>
Index: linux-2.6.36/drivers/input/joystick/as5011.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.36/drivers/input/joystick/as5011.c 2011-01-10 09:36:32.000000000 +0100
++++ linux-2.6.36/drivers/input/joystick/as5011.c 2011-01-11 09:58:15.000000000 +0100
@@ -0,0 +1,368 @@
+/*
+ * Copyright (c) 2010, 2011 Fabien Marteau <fab...@ar...>
@@ -377,8 +377,8 @@ Index: linux-2.6.36/drivers/input/joystick/as5011.c
+
Index: linux-2.6.36/drivers/input/joystick/Kconfig
===================================================================
---- linux-2.6.36.orig/drivers/input/joystick/Kconfig 2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/drivers/input/joystick/Kconfig 2011-01-03 16:58:29.000000000 +0100
+--- linux-2.6.36.orig/drivers/input/joystick/Kconfig 2011-01-11 09:57:28.000000000 +0100
++++ linux-2.6.36/drivers/input/joystick/Kconfig 2011-01-11 09:58:15.000000000 +0100
@@ -255,6 +255,15 @@
To compile this driver as a module, choose M here: the
module will be called amijoy.
@@ -397,8 +397,8 @@ Index: linux-2.6.36/drivers/input/joystick/Kconfig
select GAMEPORT
Index: linux-2.6.36/drivers/input/joystick/Makefile
===================================================================
---- linux-2.6.36.orig/drivers/input/joystick/Makefile 2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/drivers/input/joystick/Makefile 2011-01-03 16:58:29.000000000 +0100
+--- linux-2.6.36.orig/drivers/input/joystick/Makefile 2011-01-11 09:57:28.000000000 +0100
++++ linux-2.6.36/drivers/input/joystick/Makefile 2011-01-11 09:58:15.000000000 +0100
@@ -7,6 +7,7 @@
obj-$(CONFIG_JOYSTICK_A3D) += a3d.o
obj-$(CONFIG_JOYSTICK_ADI) += adi.o
@@ -409,23 +409,26 @@ Index: linux-2.6.36/drivers/input/joystick/Makefile
obj-$(CONFIG_JOYSTICK_DB9) += db9.o
Index: linux-2.6.36/include/linux/input/as5011.h
===================================================================
---- linux-2.6.36.orig/include/linux/input/as5011.h 2011-01-10 09:17:59.000000000 +0100
-+++ linux-2.6.36/include/linux/input/as5011.h 2011-01-10 09:18:58.000000000 +0100
-@@ -9,14 +9,10 @@
- * the Free Software Foundation.
- */
-
--#include <linux/mutex.h>
--
--#define AS5011_MAX_NAME_LENGTH 64
--
- struct as5011_platform_data {
-- int button_gpio;
-- int int_irq; /* irq number */
-- int int_edge;/* irq edge IRQ_TYPE_EDGE_[FALLING,RISING,BOTH] */
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.36/include/linux/input/as5011.h 2011-01-11 09:58:50.000000000 +0100
+@@ -0,0 +1,20 @@
++#ifndef _AS5011_H
++#define _AS5011_H
++
++/*
++ * Copyright (c) 2010, 2011 Fabien Marteau <fab...@ar...>
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published by
++ * the Free Software Foundation.
++ */
++
++struct as5011_platform_data {
+ unsigned int button_gpio;
+ unsigned int axis_irq; /* irq number */
+ unsigned long axis_irqflags;
- char xp, xn; /* threshold for x axis */
- char yp, yn; /* threshold for y axis */
- };
++ char xp, xn; /* threshold for x axis */
++ char yp, yn; /* threshold for y axis */
++};
++
++#endif /* _AS5011_H */
hooks/post-receive
--
armadeus
|
