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 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-shmobile
/
setup-r8a7790.c
diff --git
a/arch/arm/mach-shmobile/setup-r8a7790.c
b/arch/arm/mach-shmobile/setup-r8a7790.c
index 0c12b01bb9e33c387c959b2f61cb371360d6470c..877fdeb985d0c240e52eea158eeb16edd1b2ef68 100644
(file)
--- a/
arch/arm/mach-shmobile/setup-r8a7790.c
+++ b/
arch/arm/mach-shmobile/setup-r8a7790.c
@@
-282,11
+282,6
@@
static struct resource cmt0_resources[] = {
&cmt##idx##_platform_data, \
sizeof(struct sh_timer_config))
&cmt##idx##_platform_data, \
sizeof(struct sh_timer_config))
-void __init r8a7790_add_dt_devices(void)
-{
- r8a7790_register_cmt(0);
-}
-
void __init r8a7790_add_standard_devices(void)
{
r8a7790_register_scif(0);
void __init r8a7790_add_standard_devices(void)
{
r8a7790_register_scif(0);
@@
-299,7
+294,7
@@
void __init r8a7790_add_standard_devices(void)
r8a7790_register_scif(7);
r8a7790_register_scif(8);
r8a7790_register_scif(9);
r8a7790_register_scif(7);
r8a7790_register_scif(8);
r8a7790_register_scif(9);
- r8a7790_
add_dt_devices(
);
+ r8a7790_
register_cmt(0
);
r8a7790_register_irqc(0);
r8a7790_register_thermal();
r8a7790_register_i2c(0);
r8a7790_register_irqc(0);
r8a7790_register_thermal();
r8a7790_register_i2c(0);