aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-s3c2410/mach-gta01.c4
-rw-r--r--arch/arm/mach-s3c2442/mach-gta02.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-s3c2410/mach-gta01.c b/arch/arm/mach-s3c2410/mach-gta01.c
index c5961d49ad8..ec7b1de7da9 100644
--- a/arch/arm/mach-s3c2410/mach-gta01.c
+++ b/arch/arm/mach-s3c2410/mach-gta01.c
@@ -733,7 +733,7 @@ static struct ts_filter_linear_configuration gta01_ts_linear = {
};
#endif
-struct ts_filter_chain_configuration filter_configuration[] =
+struct ts_filter_chain_configuration gta01_filter_configuration[] =
{
#ifdef CONFIG_TOUCHSCREEN_FILTER
{&ts_filter_group_api, &gta01_ts_group.config},
@@ -747,7 +747,7 @@ struct ts_filter_chain_configuration filter_configuration[] =
static struct s3c2410_ts_mach_info gta01_ts_cfg = {
.delay = 10000,
.presc = 0xff, /* slow as we can go */
- .filter_config = filter_configuration,
+ .filter_config = gta01_filter_configuration,
};
/* SPI */
diff --git a/arch/arm/mach-s3c2442/mach-gta02.c b/arch/arm/mach-s3c2442/mach-gta02.c
index e1f8b9b2fd6..db2f1704c69 100644
--- a/arch/arm/mach-s3c2442/mach-gta02.c
+++ b/arch/arm/mach-s3c2442/mach-gta02.c
@@ -986,7 +986,7 @@ const static struct ts_filter_linear_configuration gta02_ts_linear = {
};
#endif
-const struct ts_filter_chain_configuration filter_configuration[] =
+const struct ts_filter_chain_configuration gta02_filter_configuration[] =
{
#ifdef CONFIG_TOUCHSCREEN_FILTER
{&ts_filter_group_api, &gta02_ts_group.config},
@@ -1000,7 +1000,7 @@ const struct ts_filter_chain_configuration filter_configuration[] =
const static struct s3c2410_ts_mach_info gta02_ts_cfg = {
.delay = 10000,
.presc = 0xff, /* slow as we can go */
- .filter_config = filter_configuration,
+ .filter_config = gta02_filter_configuration,
};