projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull thermal into release branch
[linux-drm-fsl-dcu.git]
/
arch
/
ppc
/
syslib
/
m8xx_setup.c
diff --git
a/arch/ppc/syslib/m8xx_setup.c
b/arch/ppc/syslib/m8xx_setup.c
index d8d299bd1a123d37f2bda11f7e85f60f9f8c3830..9caf850c9b3854a456fb3bcacc66da13a549dcdb 100644
(file)
--- a/
arch/ppc/syslib/m8xx_setup.c
+++ b/
arch/ppc/syslib/m8xx_setup.c
@@
-77,7
+77,7
@@
static struct mtd_partition mpc8xxads_partitions[] = {
}
};
}
};
-#define mpc8xxads_part_num
(sizeof (mpc8xxads_partitions) / sizeof (mpc8xxads_partitions[0])
)
+#define mpc8xxads_part_num
ARRAY_SIZE(mpc8xxads_partitions
)
#endif
#endif
@@
-413,7
+413,7
@@
m8xx_map_io(void)
io_block_mapping(_IO_BASE,_IO_BASE,_IO_BASE_SIZE, _PAGE_IO);
#endif
#endif
io_block_mapping(_IO_BASE,_IO_BASE,_IO_BASE_SIZE, _PAGE_IO);
#endif
#endif
-#if defined(CONFIG_
HTDMSOUND) || defined(CONFIG_
RPXTOUCH) || defined(CONFIG_FB_RPX)
+#if defined(CONFIG_RPXTOUCH) || defined(CONFIG_FB_RPX)
io_block_mapping(HIOX_CSR_ADDR, HIOX_CSR_ADDR, HIOX_CSR_SIZE, _PAGE_IO);
#endif
#ifdef CONFIG_FADS
io_block_mapping(HIOX_CSR_ADDR, HIOX_CSR_ADDR, HIOX_CSR_SIZE, _PAGE_IO);
#endif
#ifdef CONFIG_FADS