diff options
| author | Leah Rowe <info@minifree.org> | 2016-10-28 16:25:41 +0100 |
|---|---|---|
| committer | Leah Rowe <info@minifree.org> | 2016-10-28 16:25:41 +0100 |
| commit | 00312500dde3a1792153fe69bd8af882dc0785ef (patch) | |
| tree | 20a238e65f7fa12a0ab4a371fb2ee2b92d81c63e /resources/libreboot | |
| parent | 9af8f5425db1b2fa9cd0d0ea49666316e9bb8695 (diff) | |
| download | librebootfr-00312500dde3a1792153fe69bd8af882dc0785ef.tar.gz librebootfr-00312500dde3a1792153fe69bd8af882dc0785ef.zip | |
Revert "fix gm45 patching issue (rebase patch to universally enable wifi/bluetooth/etc)"
This reverts commit 4f39be3e455a08e2362afdb5d52ff9c80fccb780.
Diffstat (limited to 'resources/libreboot')
| -rw-r--r-- | resources/libreboot/patch/coreboot/29fc9bb855cb878aee263cd1fe110e3bb3e98c80/grub/x60/0001-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/resources/libreboot/patch/coreboot/29fc9bb855cb878aee263cd1fe110e3bb3e98c80/grub/x60/0001-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch b/resources/libreboot/patch/coreboot/29fc9bb855cb878aee263cd1fe110e3bb3e98c80/grub/x60/0001-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch index 9f0d7506..6f8b5307 100644 --- a/resources/libreboot/patch/coreboot/29fc9bb855cb878aee263cd1fe110e3bb3e98c80/grub/x60/0001-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch +++ b/resources/libreboot/patch/coreboot/29fc9bb855cb878aee263cd1fe110e3bb3e98c80/grub/x60/0001-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch @@ -1,7 +1,7 @@ -From 1a5ae09115f4abce7561d239d49e7e8b927b6d01 Mon Sep 17 00:00:00 2001 +From 1024b5e6c476dcc195dca742746735277f63236b Mon Sep 17 00:00:00 2001 From: Leah Rowe <info@minifree.org> Date: Mon, 13 Oct 2014 00:14:53 +0100 -Subject: [PATCH] NOTFORMERGE: ec/lenovo/h8: +Subject: [PATCH 5/9] NOTFORMERGE: ec/lenovo/h8: wlan/trackpoint/touchpad/bluetooth/wwan Permanently enable them. @@ -14,10 +14,10 @@ Signed-off-by: Leah Rowe <info@minifree.org> 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/src/ec/lenovo/h8/h8.c b/src/ec/lenovo/h8/h8.c -index 943bdd4..32285ac 100644 +index 2cafc88..a6cb6b6 100644 --- a/src/ec/lenovo/h8/h8.c +++ b/src/ec/lenovo/h8/h8.c -@@ -252,9 +252,11 @@ static void h8_enable(struct device *dev) +@@ -255,9 +255,11 @@ static void h8_enable(struct device *dev) ec_write(H8_FAN_CONTROL, H8_FAN_CONTROL_AUTO); @@ -32,8 +32,8 @@ index 943bdd4..32285ac 100644 h8_trackpoint_enable(1); h8_usb_power_enable(1); -@@ -262,14 +264,13 @@ static void h8_enable(struct device *dev) - if (get_option(&val, "volume") == CB_SUCCESS && !acpi_is_wakeup_s3()) +@@ -265,14 +267,13 @@ static void h8_enable(struct device *dev) + if (get_option(&val, "volume") == CB_SUCCESS) ec_write(H8_VOLUME_CONTROL, val); - if (get_option(&val, "bluetooth") != CB_SUCCESS) @@ -54,10 +54,10 @@ index 943bdd4..32285ac 100644 if (conf->has_uwb) { if (get_option(&val, "uwb") != CB_SUCCESS) diff --git a/src/ec/lenovo/pmh7/pmh7.c b/src/ec/lenovo/pmh7/pmh7.c -index b2c3c08..1570cd6 100644 +index cc6e891..38aef16 100644 --- a/src/ec/lenovo/pmh7/pmh7.c +++ b/src/ec/lenovo/pmh7/pmh7.c -@@ -102,7 +102,6 @@ static void enable_dev(struct device *dev) +@@ -106,7 +106,6 @@ static void enable_dev(struct device *dev) { struct ec_lenovo_pmh7_config *conf = dev->chip_info; struct resource *resource; @@ -65,7 +65,7 @@ index b2c3c08..1570cd6 100644 resource = new_resource(dev, EC_LENOVO_PMH7_INDEX); resource->flags = IORESOURCE_IO | IORESOURCE_FIXED; -@@ -114,13 +113,11 @@ static void enable_dev(struct device *dev) +@@ -118,13 +117,11 @@ static void enable_dev(struct device *dev) pmh7_backlight_enable(conf->backlight_enable); pmh7_dock_event_enable(conf->dock_event_enable); @@ -84,5 +84,5 @@ index b2c3c08..1570cd6 100644 struct chip_operations ec_lenovo_pmh7_ops = { -- -2.9.3 +1.9.1 |