diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-08-11 23:24:46 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-08-11 23:24:46 -0700 |
| commit | 4aa31b4b61e4985e719352c329c3948d1932cb64 (patch) | |
| tree | 251d6d11d1e5c9c09adc3e0eb1715c56b2e16c95 /drivers/power/supply/olpc_battery.c | |
| parent | Input: remove w90x900 touchscreen driver (diff) | |
| parent | Linux 5.3-rc4 (diff) | |
| download | linux-dev-4aa31b4b61e4985e719352c329c3948d1932cb64.tar.xz linux-dev-4aa31b4b61e4985e719352c329c3948d1932cb64.zip | |
Merge tag 'v5.3-rc4' into next
Sync up with mainline to bring in device_property_count_u32 andother
newer APIs.
Diffstat (limited to 'drivers/power/supply/olpc_battery.c')
| -rw-r--r-- | drivers/power/supply/olpc_battery.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/power/supply/olpc_battery.c b/drivers/power/supply/olpc_battery.c index 9f9430ac8887..ad0e9e0edb3f 100644 --- a/drivers/power/supply/olpc_battery.c +++ b/drivers/power/supply/olpc_battery.c @@ -17,7 +17,6 @@ #include <linux/jiffies.h> #include <linux/sched.h> #include <linux/olpc-ec.h> -#include <asm/olpc.h> #define EC_BAT_VOLTAGE 0x10 /* uint16_t, *9.76/32, mV */ |