[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. 270c0c0ef03de6b912aeee63d117df6fb64a37e4

[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. 270c0c0ef03de6b912aeee63d117df6fb64a37e4

[git]

[-- Attachment #1: Type: text/plain, Size: 3209 bytes --]

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 "IPFire 2.x development tree".

The branch, fifteen has been updated
       via  270c0c0ef03de6b912aeee63d117df6fb64a37e4 (commit)
       via  f2ce8e838fc8dbaeede744d8704240e3ab02036c (commit)
      from  716ddc41d3eee198a11f6da1d168d9c4226b4f2c (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 270c0c0ef03de6b912aeee63d117df6fb64a37e4
Merge: f2ce8e8 716ddc4
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sat Sep 7 14:46:45 2013 +0200

    Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen

commit f2ce8e838fc8dbaeede744d8704240e3ab02036c
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Fri Sep 6 23:26:49 2013 +0200

    kernel: enabled gpio button events.

-----------------------------------------------------------------------

Summary of changes:
 config/kernel/kernel.config.armv5tel-ipfire-kirkwood | 8 ++++----
 config/kernel/kernel.config.armv5tel-ipfire-rpi      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

Difference in files:
diff --git a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood
index 33596f5..4dd01d6 100644
--- a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood
+++ b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood
@@ -299,7 +299,7 @@ CONFIG_ARCH_KIRKWOOD=y
 # CONFIG_ARCH_DAVINCI is not set
 # CONFIG_ARCH_OMAP1 is not set
 # CONFIG_GPIO_PCA953X is not set
-CONFIG_KEYBOARD_GPIO_POLLED=m
+CONFIG_KEYBOARD_GPIO_POLLED=y
 
 #
 # Marvell Kirkwood Implementations
@@ -2221,7 +2221,7 @@ CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_QT1070 is not set
 # CONFIG_KEYBOARD_QT2160 is not set
 # CONFIG_KEYBOARD_LKKBD is not set
-CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_GPIO=y
 # CONFIG_KEYBOARD_TCA6416 is not set
 # CONFIG_KEYBOARD_TCA8418 is not set
 # CONFIG_KEYBOARD_MATRIX is not set
@@ -2258,8 +2258,8 @@ CONFIG_MOUSE_SYNAPTICS_USB=m
 # CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 CONFIG_INPUT_MISC=y
-CONFIG_INPUT_88PM860X_ONKEY=m
-CONFIG_INPUT_88PM80X_ONKEY=m
+# CONFIG_INPUT_88PM860X_ONKEY is not set
+# CONFIG_INPUT_88PM80X_ONKEY is not set
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_BMA150 is not set
 # CONFIG_INPUT_MMA8450 is not set
diff --git a/config/kernel/kernel.config.armv5tel-ipfire-rpi b/config/kernel/kernel.config.armv5tel-ipfire-rpi
index e0d2b31..9ad8301 100644
--- a/config/kernel/kernel.config.armv5tel-ipfire-rpi
+++ b/config/kernel/kernel.config.armv5tel-ipfire-rpi
@@ -1746,7 +1746,7 @@ CONFIG_INPUT_MOUSEDEV=y
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 # CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_EVDEV is not set
+CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_EVBUG is not set
 
 #


hooks/post-receive
--
IPFire 2.x development tree