diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-08 08:06:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-08 08:06:09 -0800 |
| commit | 423ab71a8bd2345f87724abe320092a3a516b0bb (patch) | |
| tree | 5d5eb306001e4341c3c073777f4d0b9e05ccd454 /include/linux | |
| parent | b7ed1de0ae4edb3fd2c53fa3dd7e6f104beb6d00 (diff) | |
| parent | 63f716b9419420defb3e550a1e5f526c11b2ed2d (diff) | |
Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bird
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ioc3.h | 2 | ||||
| -rw-r--r-- | include/linux/videodev2.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/ioc3.h b/include/linux/ioc3.h index e7906a72a4f1..da7c09e4ede6 100644 --- a/include/linux/ioc3.h +++ b/include/linux/ioc3.h @@ -27,7 +27,7 @@ struct ioc3_driver_data { int id; /* IOC3 sequence number */ /* PCI mapping */ unsigned long pma; /* physical address */ - struct __iomem ioc3 *vma; /* pointer to registers */ + struct ioc3 __iomem *vma; /* pointer to registers */ struct pci_dev *pdev; /* PCI device */ /* IRQ stuff */ int dual_irq; /* set if separate IRQs are used */ diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index b23be44cbea8..5208b12d5550 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h @@ -549,7 +549,7 @@ struct v4l2_framebuffer struct v4l2_clip { struct v4l2_rect c; - struct v4l2_clip *next; + struct v4l2_clip __user *next; }; struct v4l2_window |