sh: Consolidate MTU2/CMT/TMU timer platform data.

[safe/jmp/linux-2.6] / arch / sh / kernel / cpu / sh2a / setup-sh7203.c

diff --git a/arch/sh/kernel/cpu/sh2a/setup-sh7203.c b/arch/sh/kernel/cpu/sh2a/setup-sh7203.c
index 3448164..d749341 100644 (file)
--- a/arch/sh/kernel/cpu/sh2a/setup-sh7203.c
+++ b/arch/sh/kernel/cpu/sh2a/setup-sh7203.c
@@ -11,8 +11,7 @@
 #include <linux/init.h>
 #include <linux/serial.h>
 #include <linux/serial_sci.h>
-#include <linux/sh_cmt.h>
-#include <linux/sh_mtu2.h>
+#include <linux/sh_timer.h>
 #include <linux/io.h>
 
 enum {
@@ -208,7 +207,7 @@ static struct platform_device sci_device = {
        },
 };
 
-static struct sh_cmt_config cmt0_platform_data = {
+static struct sh_timer_config cmt0_platform_data = {
        .name = "CMT0",
        .channel_offset = 0x02,
        .timer_bit = 0,
@@ -240,7 +239,7 @@ static struct platform_device cmt0_device = {
        .num_resources  = ARRAY_SIZE(cmt0_resources),
 };
 
-static struct sh_cmt_config cmt1_platform_data = {
+static struct sh_timer_config cmt1_platform_data = {
        .name = "CMT1",
        .channel_offset = 0x08,
        .timer_bit = 1,
@@ -272,7 +271,7 @@ static struct platform_device cmt1_device = {
        .num_resources  = ARRAY_SIZE(cmt1_resources),
 };
 
-static struct sh_mtu2_config mtu2_0_platform_data = {
+static struct sh_timer_config mtu2_0_platform_data = {
        .name = "MTU2_0",
        .channel_offset = -0x80,
        .timer_bit = 0,
@@ -303,7 +302,7 @@ static struct platform_device mtu2_0_device = {
        .num_resources  = ARRAY_SIZE(mtu2_0_resources),
 };
 
-static struct sh_mtu2_config mtu2_1_platform_data = {
+static struct sh_timer_config mtu2_1_platform_data = {
        .name = "MTU2_1",
        .channel_offset = -0x100,
        .timer_bit = 1,