[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-136-g3823b7c
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-136-g3823b7c
|
From: Fabien M <fa...@us...> - 2010-11-25 16:56:53
|
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 3823b7c064b2118c46dfd029f28fd44d12917379 (commit)
from 99e581b3a12fe5dd45b9a3e953148b49ef11908f (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 3823b7c064b2118c46dfd029f28fd44d12917379
Author: Fabien Marteau <fab...@ar...>
Date: Thu Nov 25 17:56:37 2010 +0100
[linux][2.6.36] adding AS5011 driver in kernel 2.6.36
-----------------------------------------------------------------------
Summary of changes:
...us-joystick-adding_as5011_joystick_driver.patch | 22 ++++++++++----------
1 files changed, 11 insertions(+), 11 deletions(-)
copy buildroot/target/device/armadeus/linux/kernel-patches/{2.6.29 => 2.6.36}/359-armadeus-joystick-adding_as5011_joystick_driver.patch (94%)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/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
similarity index 94%
copy from buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/359-armadeus-joystick-adding_as5011_joystick_driver.patch
copy to buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/359-armadeus-joystick-adding_as5011_joystick_driver.patch
index 4709a7f..958dd72 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/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
@@ -2,10 +2,10 @@ Adding Austria Microsystem AS5011 joystick driver
Signed-off-by: Fabien Marteau <fab...@ar...>
-Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+Index: linux-2.6.36/drivers/input/joystick/as5011.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/drivers/input/joystick/as5011.c 2010-11-25 12:28:08.000000000 +0100
++++ linux-2.6.36/drivers/input/joystick/as5011.c 2010-11-25 17:47:25.000000000 +0100
@@ -0,0 +1,427 @@
+/*
+ * Copyright (c) 2010 Fabien Marteau <fab...@ar...>
@@ -434,11 +434,11 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+
+module_init(as5011_init);
+module_exit(as5011_exit);
-Index: linux-2.6.29.6/drivers/input/joystick/Kconfig
+Index: linux-2.6.36/drivers/input/joystick/Kconfig
===================================================================
---- linux-2.6.29.6.orig/drivers/input/joystick/Kconfig 2009-03-24 00:12:14.000000000 +0100
-+++ linux-2.6.29.6/drivers/input/joystick/Kconfig 2010-11-23 17:43:25.000000000 +0100
-@@ -254,6 +254,15 @@
+--- 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 2010-11-25 17:47:25.000000000 +0100
+@@ -255,6 +255,15 @@
To compile this driver as a module, choose M here: the
module will be called amijoy.
@@ -454,10 +454,10 @@ Index: linux-2.6.29.6/drivers/input/joystick/Kconfig
config JOYSTICK_JOYDUMP
tristate "Gameport data dumper"
select GAMEPORT
-Index: linux-2.6.29.6/drivers/input/joystick/Makefile
+Index: linux-2.6.36/drivers/input/joystick/Makefile
===================================================================
---- linux-2.6.29.6.orig/drivers/input/joystick/Makefile 2009-03-24 00:12:14.000000000 +0100
-+++ linux-2.6.29.6/drivers/input/joystick/Makefile 2010-11-23 17:43:25.000000000 +0100
+--- 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 2010-11-25 17:47:25.000000000 +0100
@@ -7,6 +7,7 @@
obj-$(CONFIG_JOYSTICK_A3D) += a3d.o
obj-$(CONFIG_JOYSTICK_ADI) += adi.o
@@ -466,10 +466,10 @@ Index: linux-2.6.29.6/drivers/input/joystick/Makefile
obj-$(CONFIG_JOYSTICK_ANALOG) += analog.o
obj-$(CONFIG_JOYSTICK_COBRA) += cobra.o
obj-$(CONFIG_JOYSTICK_DB9) += db9.o
-Index: linux-2.6.29.6/include/linux/as5011.h
+Index: linux-2.6.36/include/linux/as5011.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/include/linux/as5011.h 2010-11-23 17:43:25.000000000 +0100
++++ linux-2.6.36/include/linux/as5011.h 2010-11-25 17:47:25.000000000 +0100
@@ -0,0 +1,72 @@
+#ifndef _AS5011_H
+#define _AS5011_H
hooks/post-receive
--
armadeus
|
