diff options
author | Thomas White <taw@bitwiz.org.uk> | 2009-04-25 19:23:57 +0100 |
---|---|---|
committer | Thomas White <taw@bitwiz.org.uk> | 2009-04-25 19:23:57 +0100 |
commit | ca8cdf043c7c6d8e1b4b3d86f3cae12fc37756a2 (patch) | |
tree | dad605a1b3142e85d9ddc08a77d62f6bf09f22cc /arch/arm/mach-s3c2410/mach-gta01.c | |
parent | 16696dd08020690cff796fc4705b4d6bd14e91b0 (diff) | |
parent | b4136a36f31a65d0998a328465df9e8e2ba93166 (diff) |
Merge branch 'andy-tracking' into drm-tracking
Conflicts:
drivers/mfd/glamo/Kconfig
Diffstat (limited to 'arch/arm/mach-s3c2410/mach-gta01.c')
-rw-r--r-- | arch/arm/mach-s3c2410/mach-gta01.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-s3c2410/mach-gta01.c b/arch/arm/mach-s3c2410/mach-gta01.c index c5961d49ad8..bddba990a74 100644 --- a/arch/arm/mach-s3c2410/mach-gta01.c +++ b/arch/arm/mach-s3c2410/mach-gta01.c @@ -708,32 +708,32 @@ static struct s3c2410_udc_mach_info gta01_udc_cfg = { /* Touchscreen configuration. */ #ifdef CONFIG_TOUCHSCREEN_FILTER -static struct ts_filter_group_configuration gta01_ts_group = { +const static struct ts_filter_group_configuration gta01_ts_group = { .length = 12, .close_enough = 10, .threshold = 6, /* At least half of the points in a group. */ .attempts = 10, }; -static struct ts_filter_median_configuration gta01_ts_median = { +const static struct ts_filter_median_configuration gta01_ts_median = { .extent = 20, .decimation_below = 3, .decimation_threshold = 8 * 3, .decimation_above = 4, }; -static struct ts_filter_mean_configuration gta01_ts_mean = { +const static struct ts_filter_mean_configuration gta01_ts_mean = { .length = 4, }; -static struct ts_filter_linear_configuration gta01_ts_linear = { +const static struct ts_filter_linear_configuration gta01_ts_linear = { .constants = {1, 0, 0, 0, 1, 0, 1}, /* Don't modify coords. */ .coord0 = 0, .coord1 = 1, }; #endif -struct ts_filter_chain_configuration filter_configuration[] = +const static struct ts_filter_chain_configuration gta01_filter_configuration[] = { #ifdef CONFIG_TOUCHSCREEN_FILTER {&ts_filter_group_api, >a01_ts_group.config}, @@ -744,10 +744,10 @@ struct ts_filter_chain_configuration filter_configuration[] = {NULL, NULL}, }; -static struct s3c2410_ts_mach_info gta01_ts_cfg = { +const 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 */ |