diff options
| author | James Morris <jmorris@namei.org> | 2008-08-28 10:47:34 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-08-28 10:47:34 +1000 |
| commit | 86d688984deefa3ae5a802880c11f2b408b5d6cf (patch) | |
| tree | 7ea5e8189b0a774626d3ed7c3c87df2495a4c4a0 /drivers/power | |
| parent | 93c06cbbf9fea5d5be1778febb7fa9ab1a74e5f5 (diff) | |
| parent | 4c246edd2550304df5b766cc841584b2bb058843 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/palmtx_battery.c | 2 | ||||
| -rw-r--r-- | drivers/power/tosa_battery.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/power/palmtx_battery.c b/drivers/power/palmtx_battery.c index 244bb273a63..7035bfa41c6 100644 --- a/drivers/power/palmtx_battery.c +++ b/drivers/power/palmtx_battery.c @@ -22,7 +22,7 @@ #include <linux/gpio.h> #include <asm/mach-types.h> -#include <asm/arch/palmtx.h> +#include <mach/palmtx.h> static DEFINE_MUTEX(bat_lock); static struct work_struct bat_work; diff --git a/drivers/power/tosa_battery.c b/drivers/power/tosa_battery.c index bf664fbd661..2eab35aab31 100644 --- a/drivers/power/tosa_battery.c +++ b/drivers/power/tosa_battery.c @@ -19,7 +19,7 @@ #include <linux/gpio.h> #include <asm/mach-types.h> -#include <asm/arch/tosa.h> +#include <mach/tosa.h> static DEFINE_MUTEX(bat_lock); /* protects gpio pins */ static struct work_struct bat_work; |