mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
Merge branch 'openelec-linux-next' of github.com:OpenELEC/OpenELEC.tv into openelec-linux-next
This commit is contained in:
commit
0368099c36
@ -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;
|
@ -2434,6 +2434,7 @@ CONFIG_HID_PS3REMOTE=y
|
|||||||
CONFIG_HID_SAMSUNG=y
|
CONFIG_HID_SAMSUNG=y
|
||||||
CONFIG_HID_SONY=y
|
CONFIG_HID_SONY=y
|
||||||
# CONFIG_HID_SPEEDLINK is not set
|
# CONFIG_HID_SPEEDLINK is not set
|
||||||
|
CONFIG_HID_SPINELPLUS=y
|
||||||
CONFIG_HID_SUNPLUS=y
|
CONFIG_HID_SUNPLUS=y
|
||||||
# CONFIG_HID_GREENASIA is not set
|
# CONFIG_HID_GREENASIA is not set
|
||||||
# CONFIG_HID_SMARTJOYPLUS is not set
|
# CONFIG_HID_SMARTJOYPLUS is not set
|
||||||
|
@ -2374,6 +2374,7 @@ CONFIG_HID_PS3REMOTE=y
|
|||||||
CONFIG_HID_SAMSUNG=y
|
CONFIG_HID_SAMSUNG=y
|
||||||
CONFIG_HID_SONY=y
|
CONFIG_HID_SONY=y
|
||||||
# CONFIG_HID_SPEEDLINK is not set
|
# CONFIG_HID_SPEEDLINK is not set
|
||||||
|
CONFIG_HID_SPINELPLUS=y
|
||||||
CONFIG_HID_SUNPLUS=y
|
CONFIG_HID_SUNPLUS=y
|
||||||
# CONFIG_HID_GREENASIA is not set
|
# CONFIG_HID_GREENASIA is not set
|
||||||
# CONFIG_HID_SMARTJOYPLUS is not set
|
# CONFIG_HID_SMARTJOYPLUS is not set
|
||||||
|
@ -2681,6 +2681,7 @@ CONFIG_HID_PS3REMOTE=y
|
|||||||
CONFIG_HID_SAMSUNG=y
|
CONFIG_HID_SAMSUNG=y
|
||||||
CONFIG_HID_SONY=y
|
CONFIG_HID_SONY=y
|
||||||
# CONFIG_HID_SPEEDLINK is not set
|
# CONFIG_HID_SPEEDLINK is not set
|
||||||
|
CONFIG_HID_SPINELPLUS=y
|
||||||
CONFIG_HID_SUNPLUS=y
|
CONFIG_HID_SUNPLUS=y
|
||||||
# CONFIG_HID_GREENASIA is not set
|
# CONFIG_HID_GREENASIA is not set
|
||||||
# CONFIG_HID_SMARTJOYPLUS is not set
|
# CONFIG_HID_SMARTJOYPLUS is not set
|
||||||
|
@ -2628,6 +2628,7 @@ CONFIG_HID_PS3REMOTE=y
|
|||||||
CONFIG_HID_SAMSUNG=y
|
CONFIG_HID_SAMSUNG=y
|
||||||
CONFIG_HID_SONY=y
|
CONFIG_HID_SONY=y
|
||||||
# CONFIG_HID_SPEEDLINK is not set
|
# CONFIG_HID_SPEEDLINK is not set
|
||||||
|
CONFIG_HID_SPINELPLUS=y
|
||||||
CONFIG_HID_SUNPLUS=y
|
CONFIG_HID_SUNPLUS=y
|
||||||
# CONFIG_HID_GREENASIA is not set
|
# CONFIG_HID_GREENASIA is not set
|
||||||
# CONFIG_HID_SMARTJOYPLUS is not set
|
# CONFIG_HID_SMARTJOYPLUS is not set
|
||||||
|
@ -2804,6 +2804,7 @@ CONFIG_HID_PS3REMOTE=y
|
|||||||
CONFIG_HID_SAMSUNG=y
|
CONFIG_HID_SAMSUNG=y
|
||||||
CONFIG_HID_SONY=y
|
CONFIG_HID_SONY=y
|
||||||
# CONFIG_HID_SPEEDLINK is not set
|
# CONFIG_HID_SPEEDLINK is not set
|
||||||
|
CONFIG_HID_SPINELPLUS=y
|
||||||
CONFIG_HID_SUNPLUS=y
|
CONFIG_HID_SUNPLUS=y
|
||||||
# CONFIG_HID_GREENASIA is not set
|
# CONFIG_HID_GREENASIA is not set
|
||||||
# CONFIG_HID_SMARTJOYPLUS is not set
|
# CONFIG_HID_SMARTJOYPLUS is not set
|
||||||
|
@ -2807,6 +2807,7 @@ CONFIG_HID_PS3REMOTE=y
|
|||||||
CONFIG_HID_SAMSUNG=y
|
CONFIG_HID_SAMSUNG=y
|
||||||
CONFIG_HID_SONY=y
|
CONFIG_HID_SONY=y
|
||||||
# CONFIG_HID_SPEEDLINK is not set
|
# CONFIG_HID_SPEEDLINK is not set
|
||||||
|
CONFIG_HID_SPINELPLUS=y
|
||||||
CONFIG_HID_SUNPLUS=y
|
CONFIG_HID_SUNPLUS=y
|
||||||
# CONFIG_HID_GREENASIA is not set
|
# CONFIG_HID_GREENASIA is not set
|
||||||
# CONFIG_HID_SMARTJOYPLUS is not set
|
# CONFIG_HID_SMARTJOYPLUS is not set
|
||||||
|
@ -2686,6 +2686,7 @@ CONFIG_HID_PS3REMOTE=y
|
|||||||
CONFIG_HID_SAMSUNG=y
|
CONFIG_HID_SAMSUNG=y
|
||||||
CONFIG_HID_SONY=y
|
CONFIG_HID_SONY=y
|
||||||
# CONFIG_HID_SPEEDLINK is not set
|
# CONFIG_HID_SPEEDLINK is not set
|
||||||
|
CONFIG_HID_SPINELPLUS=y
|
||||||
CONFIG_HID_SUNPLUS=y
|
CONFIG_HID_SUNPLUS=y
|
||||||
# CONFIG_HID_GREENASIA is not set
|
# CONFIG_HID_GREENASIA is not set
|
||||||
# CONFIG_HID_SMARTJOYPLUS is not set
|
# CONFIG_HID_SMARTJOYPLUS is not set
|
||||||
|
@ -2615,6 +2615,7 @@ CONFIG_HID_PS3REMOTE=y
|
|||||||
CONFIG_HID_SAMSUNG=y
|
CONFIG_HID_SAMSUNG=y
|
||||||
CONFIG_HID_SONY=y
|
CONFIG_HID_SONY=y
|
||||||
# CONFIG_HID_SPEEDLINK is not set
|
# CONFIG_HID_SPEEDLINK is not set
|
||||||
|
CONFIG_HID_SPINELPLUS=y
|
||||||
CONFIG_HID_SUNPLUS=y
|
CONFIG_HID_SUNPLUS=y
|
||||||
# CONFIG_HID_GREENASIA is not set
|
# CONFIG_HID_GREENASIA is not set
|
||||||
# CONFIG_HID_SMARTJOYPLUS is not set
|
# CONFIG_HID_SMARTJOYPLUS is not set
|
||||||
|
@ -2746,6 +2746,7 @@ CONFIG_HID_PS3REMOTE=y
|
|||||||
CONFIG_HID_SAMSUNG=y
|
CONFIG_HID_SAMSUNG=y
|
||||||
CONFIG_HID_SONY=y
|
CONFIG_HID_SONY=y
|
||||||
# CONFIG_HID_SPEEDLINK is not set
|
# CONFIG_HID_SPEEDLINK is not set
|
||||||
|
CONFIG_HID_SPINELPLUS=y
|
||||||
CONFIG_HID_SUNPLUS=y
|
CONFIG_HID_SUNPLUS=y
|
||||||
# CONFIG_HID_GREENASIA is not set
|
# CONFIG_HID_GREENASIA is not set
|
||||||
# CONFIG_HID_SMARTJOYPLUS is not set
|
# CONFIG_HID_SMARTJOYPLUS is not set
|
||||||
|
@ -2676,6 +2676,7 @@ CONFIG_HID_PS3REMOTE=y
|
|||||||
CONFIG_HID_SAMSUNG=y
|
CONFIG_HID_SAMSUNG=y
|
||||||
CONFIG_HID_SONY=y
|
CONFIG_HID_SONY=y
|
||||||
# CONFIG_HID_SPEEDLINK is not set
|
# CONFIG_HID_SPEEDLINK is not set
|
||||||
|
CONFIG_HID_SPINELPLUS=y
|
||||||
CONFIG_HID_SUNPLUS=y
|
CONFIG_HID_SUNPLUS=y
|
||||||
# CONFIG_HID_GREENASIA is not set
|
# CONFIG_HID_GREENASIA is not set
|
||||||
# CONFIG_HID_SMARTJOYPLUS is not set
|
# CONFIG_HID_SMARTJOYPLUS is not set
|
||||||
|
@ -2433,6 +2433,7 @@ CONFIG_HID_PS3REMOTE=y
|
|||||||
CONFIG_HID_SAMSUNG=y
|
CONFIG_HID_SAMSUNG=y
|
||||||
CONFIG_HID_SONY=y
|
CONFIG_HID_SONY=y
|
||||||
# CONFIG_HID_SPEEDLINK is not set
|
# CONFIG_HID_SPEEDLINK is not set
|
||||||
|
CONFIG_HID_SPINELPLUS=y
|
||||||
CONFIG_HID_SUNPLUS=y
|
CONFIG_HID_SUNPLUS=y
|
||||||
# CONFIG_HID_GREENASIA is not set
|
# CONFIG_HID_GREENASIA is not set
|
||||||
# CONFIG_HID_SMARTJOYPLUS is not set
|
# CONFIG_HID_SMARTJOYPLUS is not set
|
||||||
|
@ -2751,6 +2751,7 @@ CONFIG_HID_PS3REMOTE=y
|
|||||||
CONFIG_HID_SAMSUNG=y
|
CONFIG_HID_SAMSUNG=y
|
||||||
CONFIG_HID_SONY=y
|
CONFIG_HID_SONY=y
|
||||||
# CONFIG_HID_SPEEDLINK is not set
|
# CONFIG_HID_SPEEDLINK is not set
|
||||||
|
CONFIG_HID_SPINELPLUS=y
|
||||||
CONFIG_HID_SUNPLUS=y
|
CONFIG_HID_SUNPLUS=y
|
||||||
# CONFIG_HID_GREENASIA is not set
|
# CONFIG_HID_GREENASIA is not set
|
||||||
# CONFIG_HID_SMARTJOYPLUS is not set
|
# CONFIG_HID_SMARTJOYPLUS is not set
|
||||||
|
@ -2680,6 +2680,7 @@ CONFIG_HID_PS3REMOTE=y
|
|||||||
CONFIG_HID_SAMSUNG=y
|
CONFIG_HID_SAMSUNG=y
|
||||||
CONFIG_HID_SONY=y
|
CONFIG_HID_SONY=y
|
||||||
# CONFIG_HID_SPEEDLINK is not set
|
# CONFIG_HID_SPEEDLINK is not set
|
||||||
|
CONFIG_HID_SPINELPLUS=y
|
||||||
CONFIG_HID_SUNPLUS=y
|
CONFIG_HID_SUNPLUS=y
|
||||||
# CONFIG_HID_GREENASIA is not set
|
# CONFIG_HID_GREENASIA is not set
|
||||||
# CONFIG_HID_SMARTJOYPLUS is not set
|
# CONFIG_HID_SMARTJOYPLUS is not set
|
||||||
|
Loading…
x
Reference in New Issue
Block a user