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 'drm-next' of git://people.freedesktop.org/~airlied/linux
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-shmobile
/
pm-rcar.c
diff --git
a/arch/arm/mach-shmobile/pm-rcar.c
b/arch/arm/mach-shmobile/pm-rcar.c
index 34b8a5674f85e9d9c7437be76f243026269b2857..00022ee56f80dc3075e59a6a93e05acb09a38c80 100644
(file)
--- a/
arch/arm/mach-shmobile/pm-rcar.c
+++ b/
arch/arm/mach-shmobile/pm-rcar.c
@@
-31,8
+31,6
@@
#define SYSCISR_RETRIES 1000
#define SYSCISR_DELAY_US 1
#define SYSCISR_RETRIES 1000
#define SYSCISR_DELAY_US 1
-#if defined(CONFIG_PM) || defined(CONFIG_SMP)
-
static void __iomem *rcar_sysc_base;
static DEFINE_SPINLOCK(rcar_sysc_lock); /* SMP CPUs + I/O devices */
static void __iomem *rcar_sysc_base;
static DEFINE_SPINLOCK(rcar_sysc_lock); /* SMP CPUs + I/O devices */
@@
-137,5
+135,3
@@
void __iomem *rcar_sysc_init(phys_addr_t base)
return rcar_sysc_base;
}
return rcar_sysc_base;
}
-
-#endif /* CONFIG_PM || CONFIG_SMP */