projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'samsung-pm-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux...
[linux-2.6-block.git]
/
arch
/
arm
/
plat-samsung
/
pm.c
diff --git
a/arch/arm/plat-samsung/pm.c
b/arch/arm/plat-samsung/pm.c
index c08bc51201fcacdc1f83c6d974cd4973c5608c67..f8c0f9797dcf4f0f5d041fa9c5a76895d13cf16e 100644
(file)
--- a/
arch/arm/plat-samsung/pm.c
+++ b/
arch/arm/plat-samsung/pm.c
@@
-24,7
+24,6
@@
#include <asm/suspend.h>
#ifdef CONFIG_SAMSUNG_ATAGS
-#include <mach/hardware.h>
#include <mach/map.h>
#ifndef CONFIG_ARCH_EXYNOS
#include <mach/regs-clock.h>