summaryrefslogtreecommitdiff
path: root/drivers/staging/easycap/easycap_settings.c
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2011-02-03 13:42:47 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2011-02-04 12:44:33 -0800
commit055e3a3a2cdcb7d39d14857e2fb2175c11168ee7 (patch)
treecebf7befb37bfd7ab7ca2ae1acaa828db26fd5d1 /drivers/staging/easycap/easycap_settings.c
parent1a4cb0fb7da009643368b3577b65a2d1da5485dd (diff)
staging/easycap: replace underscored types with regular once
the underscored types should be used in user space headers only Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/easycap/easycap_settings.c')
-rw-r--r--drivers/staging/easycap/easycap_settings.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/easycap/easycap_settings.c b/drivers/staging/easycap/easycap_settings.c
index 6ae1a73099f..22d69cca549 100644
--- a/drivers/staging/easycap/easycap_settings.c
+++ b/drivers/staging/easycap/easycap_settings.c
@@ -314,10 +314,10 @@ int
fillin_formats(void)
{
int i, j, k, m, n;
-__u32 width, height, pixelformat, bytesperline, sizeimage;
+u32 width, height, pixelformat, bytesperline, sizeimage;
enum v4l2_field field;
enum v4l2_colorspace colorspace;
-__u16 mask1, mask2, mask3, mask4;
+u16 mask1, mask2, mask3, mask4;
char name1[32], name2[32], name3[32], name4[32];
for (i = 0, n = 0; i < STANDARD_MANY; i++) {
mask1 = 0x0000;