mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-31 14:37:59 +00:00
Merge pull request #3616 from 150balbes/fix_old_patches
removing old patches
This commit is contained in:
commit
77b028c3bf
@ -1,24 +0,0 @@
|
|||||||
diff -Naur linux-2.6.23-rc9.orig/arch/i386/boot/tty.c linux-2.6.23-rc9/arch/i386/boot/tty.c
|
|
||||||
--- linux-2.6.23-rc9.orig/arch/x86/boot/tty.c 2007-10-06 12:26:14.000000000 +0200
|
|
||||||
+++ linux-2.6.23-rc9/arch/x86/boot/tty.c 2007-10-06 12:37:47.000000000 +0200
|
|
||||||
@@ -92,7 +92,7 @@
|
|
||||||
|
|
||||||
int getchar_timeout(void)
|
|
||||||
{
|
|
||||||
- int cnt = 30;
|
|
||||||
+ int cnt = 3;
|
|
||||||
int t0, t1;
|
|
||||||
|
|
||||||
t0 = gettime();
|
|
||||||
diff -Naur linux-2.6.23-rc9.orig/arch/i386/boot/video.c linux-2.6.23-rc9/arch/i386/boot/video.c
|
|
||||||
--- linux-2.6.23-rc9.orig/arch/x86/boot/video.c 2007-10-06 12:26:14.000000000 +0200
|
|
||||||
+++ linux-2.6.23-rc9/arch/x86/boot/video.c 2007-10-06 12:36:05.000000000 +0200
|
|
||||||
@@ -329,7 +329,7 @@
|
|
||||||
unsigned int sel;
|
|
||||||
|
|
||||||
puts("Press <ENTER> to see video modes available, "
|
|
||||||
- "<SPACE> to continue, or wait 30 sec\n");
|
|
||||||
+ "<SPACE> to continue, or wait 3 sec\n");
|
|
||||||
|
|
||||||
kbd_flush();
|
|
||||||
while (1) {
|
|
@ -1,30 +0,0 @@
|
|||||||
From 4ff58b642f80dedb20533978123d89b5ac9b1ed5 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Kyle McMartin <kyle@phobos.i.jkkm.org>
|
|
||||||
Date: Tue, 30 Mar 2010 00:04:29 -0400
|
|
||||||
Subject: die-floppy-die
|
|
||||||
|
|
||||||
Kill the floppy.ko pnp modalias. We were surviving just fine without
|
|
||||||
autoloading floppy drivers, tyvm.
|
|
||||||
|
|
||||||
Please feel free to register all complaints in the wastepaper bin.
|
|
||||||
---
|
|
||||||
drivers/block/floppy.c | 3 +--
|
|
||||||
1 files changed, 1 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
|
|
||||||
index 90c4038..f4a0b90 100644
|
|
||||||
--- a/drivers/block/floppy.c
|
|
||||||
+++ b/drivers/block/floppy.c
|
|
||||||
@@ -4619,8 +4619,7 @@ static const struct pnp_device_id floppy_pnpids[] = {
|
|
||||||
{"PNP0700", 0},
|
|
||||||
{}
|
|
||||||
};
|
|
||||||
-
|
|
||||||
-MODULE_DEVICE_TABLE(pnp, floppy_pnpids);
|
|
||||||
+/* MODULE_DEVICE_TABLE(pnp, floppy_pnpids); */
|
|
||||||
|
|
||||||
#else
|
|
||||||
|
|
||||||
--
|
|
||||||
1.7.0.1
|
|
||||||
|
|
@ -1,59 +0,0 @@
|
|||||||
From 2a79554c864ac58fa2ad982f0fcee2cc2aa33eb5 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Bastien Nocera <hadess@hadess.net>
|
|
||||||
Date: Thu, 20 May 2010 10:30:31 -0400
|
|
||||||
Subject: Disable i8042 checks on Intel Apple Macs
|
|
||||||
|
|
||||||
As those computers never had any i8042 controllers, and the
|
|
||||||
current lookup code could potentially lock up/hang/wait for
|
|
||||||
timeout for long periods of time.
|
|
||||||
|
|
||||||
Fixes intermittent hangs on boot on a MacbookAir1,1
|
|
||||||
|
|
||||||
Signed-off-by: Bastien Nocera <hadess@hadess.net>
|
|
||||||
---
|
|
||||||
drivers/input/serio/i8042.c | 22 ++++++++++++++++++++++
|
|
||||||
1 files changed, 22 insertions(+), 0 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
|
|
||||||
index 6440a8f..4d7cf98 100644
|
|
||||||
--- a/drivers/input/serio/i8042.c
|
|
||||||
+++ b/drivers/input/serio/i8042.c
|
|
||||||
@@ -1451,6 +1451,22 @@ static struct platform_driver i8042_driver = {
|
|
||||||
.shutdown = i8042_shutdown,
|
|
||||||
};
|
|
||||||
|
|
||||||
+#ifdef CONFIG_DMI
|
|
||||||
+static struct dmi_system_id __initdata dmi_system_table[] = {
|
|
||||||
+ {
|
|
||||||
+ .matches = {
|
|
||||||
+ DMI_MATCH(DMI_BIOS_VENDOR, "Apple Computer, Inc.")
|
|
||||||
+ },
|
|
||||||
+ },
|
|
||||||
+ {
|
|
||||||
+ .matches = {
|
|
||||||
+ DMI_MATCH(DMI_BIOS_VENDOR, "Apple Inc.")
|
|
||||||
+ },
|
|
||||||
+ },
|
|
||||||
+ {}
|
|
||||||
+};
|
|
||||||
+#endif /*CONFIG_DMI*/
|
|
||||||
+
|
|
||||||
static int __init i8042_init(void)
|
|
||||||
{
|
|
||||||
struct platform_device *pdev;
|
|
||||||
@@ -1458,6 +1474,12 @@ static int __init i8042_init(void)
|
|
||||||
|
|
||||||
dbg_init();
|
|
||||||
|
|
||||||
+#ifdef CONFIG_DMI
|
|
||||||
+ /* Intel Apple Macs never have an i8042 controller */
|
|
||||||
+ if (dmi_check_system(dmi_system_table) > 0)
|
|
||||||
+ return -ENODEV;
|
|
||||||
+#endif /*CONFIG_DMI*/
|
|
||||||
+
|
|
||||||
err = i8042_platform_init();
|
|
||||||
if (err)
|
|
||||||
return err;
|
|
||||||
--
|
|
||||||
1.7.0.1
|
|
||||||
|
|
Loading…
x
Reference in New Issue
Block a user