[pkg-fso-commits] [SCM] linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko branch, andy-tracking, updated. upstream/20090303.gitb9de904e-140-g23b564c

[Nelson Castillo]

The following commit has been merged in the andy-tracking branch:
commit 44d9e5b72cb127c3f4cf0def6623d4ace2d8fa92
Author: Tim Niemeyer <tim.niemeyer at mastersword.de>
Date:   Tue Apr 14 19:07:25 2009 +0200

    better naming for filter_configuration
    
    this affects gta01 and gta02, now we can enable both in the .config
    
    Signed-off-by: Tim Niemeyer <tim.niemeyer at mastersword.de>

diff --git a/arch/arm/mach-s3c2410/mach-gta01.c b/arch/arm/mach-s3c2410/mach-gta01.c
index c5961d4..ec7b1de 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 e1f8b9b..db2f170 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,
 };
 
 

-- 
linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko