projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch develop-3.10 into develop-3.10-next
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
power
/
rk30_factory_adc_battery.c
diff --git
a/drivers/power/rk30_factory_adc_battery.c
b/drivers/power/rk30_factory_adc_battery.c
index d1c8cce46b2fe321977918ea992f13047daaa33e..4d025ba6d7e8186a3ba47ad05244adaa03afca75 100755
(executable)
--- a/
drivers/power/rk30_factory_adc_battery.c
+++ b/
drivers/power/rk30_factory_adc_battery.c
@@
-22,9
+22,6
@@
#include <linux/pci.h>
#include <linux/interrupt.h>
#include <asm/io.h>
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-#include <asm/mach/map.h>
#include <linux/adc.h>
#include <linux/delay.h>
#include <linux/ktime.h>