Merge branch 'openelec-linux-next' of github.com:OpenELEC/OpenELEC.tv into openelec-linux-next

2025-07-29 05:36:47 +00:00 · 2013-03-26 21:16:28 +01:00 · 2013-03-26 21:16:28 +01:00 · 0368099c36
commit 0368099c36
parent 01c7f6d41c c2aff396e6
14 changed files with 35 additions and 0 deletions
--- a/packages/linux-drivers/dvbhdhomerun/patches/dvbhdhomerun-linux-3.8.4.patch
+++ b/packages/linux-drivers/dvbhdhomerun/patches/dvbhdhomerun-linux-3.8.4.patch
@ -0,0 +1,22 @@
+diff --git a/kernel/dvb_hdhomerun_init.c b/kernel/dvb_hdhomerun_init.c
+index d02a322..bd97d5e 100644
+--- a/kernel/dvb_hdhomerun_init.c
+++ b/kernel/dvb_hdhomerun_init.c
+@@ -143,7 +143,7 @@ static int dvb_hdhomerun_stop_feed(struct dvb_demux_feed *feed)
+ 	return ret;
+ }
+ 
+-static int __devinit dvb_hdhomerun_register(struct dvb_hdhomerun *hdhomerun)
+static int  dvb_hdhomerun_register(struct dvb_hdhomerun *hdhomerun)
+ {
+ 	struct dvb_adapter *dvb_adapter;
+ 	struct dvb_demux *dvbdemux;
+@@ -284,7 +284,7 @@ static void dvb_hdhomerun_unregister(struct dvb_hdhomerun *hdhomerun)
+ }
+ 
+ 
+-static int __devinit dvb_hdhomerun_probe(struct platform_device *plat_dev)
+static int dvb_hdhomerun_probe(struct platform_device *plat_dev)
+ {
+ 	int ret;
+ 	struct dvb_hdhomerun *hdhomerun;
--- a/projects/ARCTIC_MC/linux/linux.x86_64.conf
+++ b/projects/ARCTIC_MC/linux/linux.x86_64.conf
@ -2434,6 +2434,7 @@ CONFIG_HID_PS3REMOTE=y
 CONFIG_HID_SAMSUNG=y
 CONFIG_HID_SONY=y
 # CONFIG_HID_SPEEDLINK is not set
+CONFIG_HID_SPINELPLUS=y
 CONFIG_HID_SUNPLUS=y
 # CONFIG_HID_GREENASIA is not set
 # CONFIG_HID_SMARTJOYPLUS is not set
--- a/projects/ATV/linux/linux.i386.conf
+++ b/projects/ATV/linux/linux.i386.conf
@ -2374,6 +2374,7 @@ CONFIG_HID_PS3REMOTE=y
 CONFIG_HID_SAMSUNG=y
 CONFIG_HID_SONY=y
 # CONFIG_HID_SPEEDLINK is not set
+CONFIG_HID_SPINELPLUS=y
 CONFIG_HID_SUNPLUS=y
 # CONFIG_HID_GREENASIA is not set
 # CONFIG_HID_SMARTJOYPLUS is not set
--- a/projects/Fusion/linux/linux.i386.conf
+++ b/projects/Fusion/linux/linux.i386.conf
@ -2681,6 +2681,7 @@ CONFIG_HID_PS3REMOTE=y
 CONFIG_HID_SAMSUNG=y
 CONFIG_HID_SONY=y
 # CONFIG_HID_SPEEDLINK is not set
+CONFIG_HID_SPINELPLUS=y
 CONFIG_HID_SUNPLUS=y
 # CONFIG_HID_GREENASIA is not set
 # CONFIG_HID_SMARTJOYPLUS is not set
--- a/projects/Fusion/linux/linux.x86_64.conf
+++ b/projects/Fusion/linux/linux.x86_64.conf
@ -2628,6 +2628,7 @@ CONFIG_HID_PS3REMOTE=y
 CONFIG_HID_SAMSUNG=y
 CONFIG_HID_SONY=y
 # CONFIG_HID_SPEEDLINK is not set
+CONFIG_HID_SPINELPLUS=y
 CONFIG_HID_SUNPLUS=y
 # CONFIG_HID_GREENASIA is not set
 # CONFIG_HID_SMARTJOYPLUS is not set
--- a/projects/Generic/linux/linux.i386.conf
+++ b/projects/Generic/linux/linux.i386.conf
@ -2804,6 +2804,7 @@ CONFIG_HID_PS3REMOTE=y
 CONFIG_HID_SAMSUNG=y
 CONFIG_HID_SONY=y
 # CONFIG_HID_SPEEDLINK is not set
+CONFIG_HID_SPINELPLUS=y
 CONFIG_HID_SUNPLUS=y
 # CONFIG_HID_GREENASIA is not set
 # CONFIG_HID_SMARTJOYPLUS is not set
--- a/projects/Generic_OSS/linux/linux.i386.conf
+++ b/projects/Generic_OSS/linux/linux.i386.conf
@ -2807,6 +2807,7 @@ CONFIG_HID_PS3REMOTE=y
 CONFIG_HID_SAMSUNG=y
 CONFIG_HID_SONY=y
 # CONFIG_HID_SPEEDLINK is not set
+CONFIG_HID_SPINELPLUS=y
 CONFIG_HID_SUNPLUS=y
 # CONFIG_HID_GREENASIA is not set
 # CONFIG_HID_SMARTJOYPLUS is not set
--- a/projects/ION/linux/linux.i386.conf
+++ b/projects/ION/linux/linux.i386.conf
@ -2686,6 +2686,7 @@ CONFIG_HID_PS3REMOTE=y
 CONFIG_HID_SAMSUNG=y
 CONFIG_HID_SONY=y
 # CONFIG_HID_SPEEDLINK is not set
+CONFIG_HID_SPINELPLUS=y
 CONFIG_HID_SUNPLUS=y
 # CONFIG_HID_GREENASIA is not set
 # CONFIG_HID_SMARTJOYPLUS is not set
--- a/projects/ION/linux/linux.x86_64.conf
+++ b/projects/ION/linux/linux.x86_64.conf
@ -2615,6 +2615,7 @@ CONFIG_HID_PS3REMOTE=y
 CONFIG_HID_SAMSUNG=y
 CONFIG_HID_SONY=y
 # CONFIG_HID_SPEEDLINK is not set
+CONFIG_HID_SPINELPLUS=y
 CONFIG_HID_SUNPLUS=y
 # CONFIG_HID_GREENASIA is not set
 # CONFIG_HID_SMARTJOYPLUS is not set
--- a/projects/Intel/linux/linux.i386.conf
+++ b/projects/Intel/linux/linux.i386.conf
@ -2746,6 +2746,7 @@ CONFIG_HID_PS3REMOTE=y
 CONFIG_HID_SAMSUNG=y
 CONFIG_HID_SONY=y
 # CONFIG_HID_SPEEDLINK is not set
+CONFIG_HID_SPINELPLUS=y
 CONFIG_HID_SUNPLUS=y
 # CONFIG_HID_GREENASIA is not set
 # CONFIG_HID_SMARTJOYPLUS is not set
--- a/projects/Intel/linux/linux.x86_64.conf
+++ b/projects/Intel/linux/linux.x86_64.conf
@ -2676,6 +2676,7 @@ CONFIG_HID_PS3REMOTE=y
 CONFIG_HID_SAMSUNG=y
 CONFIG_HID_SONY=y
 # CONFIG_HID_SPEEDLINK is not set
+CONFIG_HID_SPINELPLUS=y
 CONFIG_HID_SUNPLUS=y
 # CONFIG_HID_GREENASIA is not set
 # CONFIG_HID_SMARTJOYPLUS is not set
--- a/projects/Ultra/linux/linux.x86_64.conf
+++ b/projects/Ultra/linux/linux.x86_64.conf
@ -2433,6 +2433,7 @@ CONFIG_HID_PS3REMOTE=y
 CONFIG_HID_SAMSUNG=y
 CONFIG_HID_SONY=y
 # CONFIG_HID_SPEEDLINK is not set
+CONFIG_HID_SPINELPLUS=y
 CONFIG_HID_SUNPLUS=y
 # CONFIG_HID_GREENASIA is not set
 # CONFIG_HID_SMARTJOYPLUS is not set
--- a/projects/Virtual/linux/linux.i386.conf
+++ b/projects/Virtual/linux/linux.i386.conf
@ -2751,6 +2751,7 @@ CONFIG_HID_PS3REMOTE=y
 CONFIG_HID_SAMSUNG=y
 CONFIG_HID_SONY=y
 # CONFIG_HID_SPEEDLINK is not set
+CONFIG_HID_SPINELPLUS=y
 CONFIG_HID_SUNPLUS=y
 # CONFIG_HID_GREENASIA is not set
 # CONFIG_HID_SMARTJOYPLUS is not set
--- a/projects/Virtual/linux/linux.x86_64.conf
+++ b/projects/Virtual/linux/linux.x86_64.conf
@ -2680,6 +2680,7 @@ CONFIG_HID_PS3REMOTE=y
 CONFIG_HID_SAMSUNG=y
 CONFIG_HID_SONY=y
 # CONFIG_HID_SPEEDLINK is not set
+CONFIG_HID_SPINELPLUS=y
 CONFIG_HID_SUNPLUS=y
 # CONFIG_HID_GREENASIA is not set
 # CONFIG_HID_SMARTJOYPLUS is not set