diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-25 10:40:14 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-25 10:40:14 -0400 |
| commit | ff877ea80efa2015b6263766f78ee42c2a1b32f9 (patch) | |
| tree | 85205005c611ab774702148558321c6fb92f1ccd /include/media/pwc-ioctl.h | |
| parent | 30821fee4f0cb3e6d241d9f7ddc37742212e3eb7 (diff) | |
| parent | d37e6bf68fc1eb34a4ad21d9ae8890ed37ea80e7 (diff) | |
Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6
Diffstat (limited to 'include/media/pwc-ioctl.h')
| -rw-r--r-- | include/media/pwc-ioctl.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/media/pwc-ioctl.h b/include/media/pwc-ioctl.h index adc1254e887e..0f19779c4634 100644 --- a/include/media/pwc-ioctl.h +++ b/include/media/pwc-ioctl.h | |||
| @@ -55,8 +55,7 @@ | |||
| 55 | #include <linux/types.h> | 55 | #include <linux/types.h> |
| 56 | #include <linux/version.h> | 56 | #include <linux/version.h> |
| 57 | 57 | ||
| 58 | 58 | /* Enumeration of image sizes */ | |
| 59 | /* Enumeration of image sizes */ | ||
| 60 | #define PSZ_SQCIF 0x00 | 59 | #define PSZ_SQCIF 0x00 |
| 61 | #define PSZ_QSIF 0x01 | 60 | #define PSZ_QSIF 0x01 |
| 62 | #define PSZ_QCIF 0x02 | 61 | #define PSZ_QCIF 0x02 |