diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-12-30 01:10:06 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-12-30 01:10:06 -0800 |
| commit | 1dd3294677d5484e4813c6c454ba7f192a3ef61d (patch) | |
| tree | e29306ffe8b709a7499a25ecbe3234f833fc7002 /arch | |
| parent | 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 (diff) | |
| parent | e941da3110422c4e57c3d05759fb9475b28f45f6 (diff) | |
| download | linux-stable-1dd3294677d5484e4813c6c454ba7f192a3ef61d.tar.gz linux-stable-1dd3294677d5484e4813c6c454ba7f192a3ef61d.tar.bz2 linux-stable-1dd3294677d5484e4813c6c454ba7f192a3ef61d.zip | |
Merge branch 'next' into for-linus
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/pxa930_rotary.h | 20 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/pxa930_trkball.h | 10 |
2 files changed, 30 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/include/mach/pxa930_rotary.h b/arch/arm/mach-pxa/include/mach/pxa930_rotary.h new file mode 100644 index 000000000000..053587caffdd --- /dev/null +++ b/arch/arm/mach-pxa/include/mach/pxa930_rotary.h @@ -0,0 +1,20 @@ +#ifndef __ASM_ARCH_PXA930_ROTARY_H +#define __ASM_ARCH_PXA930_ROTARY_H + +/* NOTE: + * + * rotary can be either interpreted as a ralative input event (e.g. + * REL_WHEEL or REL_HWHEEL) or a specific key event (e.g. UP/DOWN + * or LEFT/RIGHT), depending on if up_key & down_key are assigned + * or rel_code is assigned a non-zero value. When all are non-zero, + * up_key and down_key will be preferred. + */ +struct pxa930_rotary_platform_data { + int up_key; + int down_key; + int rel_code; +}; + +void __init pxa930_set_rotarykey_info(struct pxa930_rotary_platform_data *info); + +#endif /* __ASM_ARCH_PXA930_ROTARY_H */ diff --git a/arch/arm/mach-pxa/include/mach/pxa930_trkball.h b/arch/arm/mach-pxa/include/mach/pxa930_trkball.h new file mode 100644 index 000000000000..5e0789bc4729 --- /dev/null +++ b/arch/arm/mach-pxa/include/mach/pxa930_trkball.h @@ -0,0 +1,10 @@ +#ifndef __ASM_ARCH_PXA930_TRKBALL_H +#define __ASM_ARCH_PXA930_TRKBALL_H + +struct pxa930_trkball_platform_data { + int x_filter; + int y_filter; +}; + +#endif /* __ASM_ARCH_PXA930_TRKBALL_H */ + |