projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
arch
/
arm
/
plat-samsung
/
devs.c
diff --git
a/arch/arm/plat-samsung/devs.c
b/arch/arm/plat-samsung/devs.c
index 33ad3f32c2b91ffa7e7bae60ecb4e17baa59d2e2..30c2fe243f7658c0002c93ce4c9aaf154e1ca1db 100644
(file)
--- a/
arch/arm/plat-samsung/devs.c
+++ b/
arch/arm/plat-samsung/devs.c
@@
-1074,7
+1074,7
@@
struct platform_device s5p_device_onenand = {
/* PMU */
-#if
def CONFIG_PLAT_S5P
+#if
defined(CONFIG_PLAT_S5P) && !defined(CONFIG_ARCH_EXYNOS)
static struct resource s5p_pmu_resource[] = {
DEFINE_RES_IRQ(IRQ_PMU)
};