From 18465753ca6387804ea09a343fb0f64cf6c84faa Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 15 Jun 2014 15:52:41 +0200 Subject: [PATCH] projects/*/linux: sync kernel config Signed-off-by: Stephan Raue --- projects/ATV/linux/linux.i386.conf | 4 ++-- projects/Generic/linux/linux.i386.conf | 4 ++-- projects/Generic/linux/linux.x86_64.conf | 4 ++-- projects/RPi/linux/linux.arm.conf | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf index ed2f21b7f7..ea11a89db8 100644 --- a/projects/ATV/linux/linux.i386.conf +++ b/projects/ATV/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.15.0-rc7 Kernel Configuration +# Linux/i386 3.15.0 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -2584,6 +2584,7 @@ CONFIG_HID_MONTEREY=y # CONFIG_HID_MULTITOUCH is not set # CONFIG_HID_NTRIG is not set CONFIG_HID_ORTEK=y +CONFIG_HID_OUYA=y # CONFIG_HID_PANTHERLORD is not set CONFIG_HID_PETALYNX=y # CONFIG_HID_PICOLCD is not set @@ -2593,7 +2594,6 @@ CONFIG_HID_PETALYNX=y CONFIG_HID_SAMSUNG=y CONFIG_HID_SONY=y CONFIG_SONY_FF=y -CONFIG_HID_OUYA=y # CONFIG_HID_SPEEDLINK is not set # CONFIG_HID_STEELSERIES is not set CONFIG_HID_SPINELPLUS=y diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf index 6df86d3851..ee7e34a776 100644 --- a/projects/Generic/linux/linux.i386.conf +++ b/projects/Generic/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.15.0-rc7 Kernel Configuration +# Linux/i386 3.15.0 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -3051,6 +3051,7 @@ CONFIG_HID_MONTEREY=y # CONFIG_HID_MULTITOUCH is not set # CONFIG_HID_NTRIG is not set CONFIG_HID_ORTEK=y +CONFIG_HID_OUYA=y # CONFIG_HID_PANTHERLORD is not set CONFIG_HID_PETALYNX=y # CONFIG_HID_PICOLCD is not set @@ -3060,7 +3061,6 @@ CONFIG_HID_PETALYNX=y CONFIG_HID_SAMSUNG=y CONFIG_HID_SONY=y CONFIG_SONY_FF=y -CONFIG_HID_OUYA=y # CONFIG_HID_SPEEDLINK is not set # CONFIG_HID_STEELSERIES is not set CONFIG_HID_SPINELPLUS=y diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf index 6e13e2bf77..82a2c660fc 100644 --- a/projects/Generic/linux/linux.x86_64.conf +++ b/projects/Generic/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.15.0-rc7 Kernel Configuration +# Linux/x86_64 3.15.0 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -3021,6 +3021,7 @@ CONFIG_HID_MONTEREY=y # CONFIG_HID_MULTITOUCH is not set # CONFIG_HID_NTRIG is not set CONFIG_HID_ORTEK=y +CONFIG_HID_OUYA=y # CONFIG_HID_PANTHERLORD is not set CONFIG_HID_PETALYNX=y # CONFIG_HID_PICOLCD is not set @@ -3030,7 +3031,6 @@ CONFIG_HID_PETALYNX=y CONFIG_HID_SAMSUNG=y CONFIG_HID_SONY=y CONFIG_SONY_FF=y -CONFIG_HID_OUYA=y # CONFIG_HID_SPEEDLINK is not set # CONFIG_HID_STEELSERIES is not set CONFIG_HID_SPINELPLUS=y diff --git a/projects/RPi/linux/linux.arm.conf b/projects/RPi/linux/linux.arm.conf index 6995fa6eb3..4196b21c28 100644 --- a/projects/RPi/linux/linux.arm.conf +++ b/projects/RPi/linux/linux.arm.conf @@ -2263,6 +2263,7 @@ CONFIG_HID_MONTEREY=y # CONFIG_HID_MULTITOUCH is not set # CONFIG_HID_NTRIG is not set CONFIG_HID_ORTEK=y +CONFIG_HID_OUYA=y # CONFIG_HID_PANTHERLORD is not set CONFIG_HID_PETALYNX=y # CONFIG_HID_PICOLCD is not set @@ -2272,7 +2273,6 @@ CONFIG_HID_PETALYNX=y CONFIG_HID_SAMSUNG=y CONFIG_HID_SONY=y CONFIG_SONY_FF=y -CONFIG_HID_OUYA=y # CONFIG_HID_SPEEDLINK is not set # CONFIG_HID_STEELSERIES is not set CONFIG_HID_SPINELPLUS=y