diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-28 11:26:12 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-28 11:26:12 -0400 |
| commit | 7a9787e1eba95a166265e6a260cf30af04ef0a99 (patch) | |
| tree | e730a4565e0318140d2fbd2f0415d18a339d7336 /drivers/media/video/w9968cf.h | |
| parent | 41b9eb264c8407655db57b60b4457fe1b2ec9977 (diff) | |
| parent | 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff) | |
Merge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot-irq-quirks
Diffstat (limited to 'drivers/media/video/w9968cf.h')
| -rw-r--r-- | drivers/media/video/w9968cf.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/w9968cf.h b/drivers/media/video/w9968cf.h index 3c95316bc030..30032e15e23c 100644 --- a/drivers/media/video/w9968cf.h +++ b/drivers/media/video/w9968cf.h | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | #ifndef _W9968CF_H_ | 21 | #ifndef _W9968CF_H_ |
| 22 | #define _W9968CF_H_ | 22 | #define _W9968CF_H_ |
| 23 | 23 | ||
| 24 | #include <linux/videodev.h> | 24 | #include <linux/videodev2.h> |
| 25 | #include <linux/usb.h> | 25 | #include <linux/usb.h> |
| 26 | #include <linux/i2c.h> | 26 | #include <linux/i2c.h> |
| 27 | #include <linux/device.h> | 27 | #include <linux/device.h> |