1- From 4aeededdff17f504089c636a70133881becdad5a Mon Sep 17 00:00:00 2001
1+ From 7e1cb9d4aab83fe74b0e45a3a5d4eb475fb34f73 Mon Sep 17 00:00:00 2001
22From: Maximilian Luz <
[email protected] >
33Date: Fri, 26 Jul 2019 04:45:10 +0200
44Subject: [PATCH 03/12] buttons
@@ -28,10 +28,10 @@ index d07c1eb15aa6..7d9ae394e597 100644
2828 To compile this driver as a module, choose M here: the
2929 module will be called soc_button_array.
3030diff --git a/drivers/input/misc/soc_button_array.c b/drivers/input/misc/soc_button_array.c
31- index 55cd6e0b409c..8f21c062c85d 100644
31+ index 5e59f8e57f8e..6f0133fe1546 100644
3232--- a/drivers/input/misc/soc_button_array.c
3333+++ b/drivers/input/misc/soc_button_array.c
34- @@ -29 ,6 +29 ,11 @@ struct soc_button_info {
34+ @@ -25 ,6 +25 ,11 @@ struct soc_button_info {
3535 bool wakeup;
3636 };
3737
@@ -43,7 +43,7 @@ index 55cd6e0b409c..8f21c062c85d 100644
4343 /*
4444 * Some of the buttons like volume up/down are auto repeat, while others
4545 * are not. To support both, we register two platform devices, and put
46- @@ -91 ,8 +96 ,13 @@ soc_button_device_create(struct platform_device *pdev,
46+ @@ -87 ,8 +92 ,13 @@ soc_button_device_create(struct platform_device *pdev,
4747 continue;
4848
4949 gpio = soc_button_lookup_gpio(&pdev->dev, info->acpi_index);
@@ -191,10 +191,10 @@ index 55cd6e0b409c..8f21c062c85d 100644
191191 };
192192
193193diff --git a/drivers/platform/x86/surfacepro3_button.c b/drivers/platform/x86/surfacepro3_button.c
194- index 1b491690ce07..96627627060e 100644
194+ index 47c6d000465a..ec515223f654 100644
195195--- a/drivers/platform/x86/surfacepro3_button.c
196196+++ b/drivers/platform/x86/surfacepro3_button.c
197- @@ -24 ,6 +24 ,12 @@
197+ @@ -20 ,6 +20 ,12 @@
198198 #define SURFACE_BUTTON_OBJ_NAME "VGBI"
199199 #define SURFACE_BUTTON_DEVICE_NAME "Surface Pro 3/4 Buttons"
200200
@@ -207,7 +207,7 @@ index 1b491690ce07..96627627060e 100644
207207 #define SURFACE_BUTTON_NOTIFY_TABLET_MODE 0xc8
208208
209209 #define SURFACE_BUTTON_NOTIFY_PRESS_POWER 0xc6
210- @@ -146 ,6 +152 ,44 @@ static int surface_button_resume(struct device *dev)
210+ @@ -142 ,6 +148 ,44 @@ static int surface_button_resume(struct device *dev)
211211 }
212212 #endif
213213
@@ -252,7 +252,7 @@ index 1b491690ce07..96627627060e 100644
252252 static int surface_button_add(struct acpi_device *device)
253253 {
254254 struct surface_button *button;
255- @@ -158 ,6 +202 ,9 @@ static int surface_button_add(struct acpi_device *device)
255+ @@ -154 ,6 +198 ,9 @@ static int surface_button_add(struct acpi_device *device)
256256 strlen(SURFACE_BUTTON_OBJ_NAME)))
257257 return -ENODEV;
258258
0 commit comments