diff options
author | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 23:32:24 +0200 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 23:32:24 +0200 |
commit | a348a7e6fdbcd2d5192a09719a479bb238fde727 (patch) | |
tree | 5ff94185f4e5a810777469d7fe7832a8ec2d3430 /drivers/media/video/ov511.h | |
parent | dmaengine: at_hdmac: add DMA slave transfers (diff) | |
parent | Linux 2.6.31-rc1 (diff) | |
download | linux-a348a7e6fdbcd2d5192a09719a479bb238fde727.tar.xz linux-a348a7e6fdbcd2d5192a09719a479bb238fde727.zip |
Merge commit 'v2.6.31-rc1' into dmaengine
Diffstat (limited to 'drivers/media/video/ov511.h')
-rw-r--r-- | drivers/media/video/ov511.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/video/ov511.h b/drivers/media/video/ov511.h index 70d99e52329d..c450c92468da 100644 --- a/drivers/media/video/ov511.h +++ b/drivers/media/video/ov511.h @@ -494,6 +494,9 @@ struct usb_ov511 { int has_decoder; /* Device has a video decoder */ int pal; /* Device is designed for PAL resolution */ + /* ov511 device number ID */ + int nr; /* Stores a device number */ + /* I2C interface */ struct mutex i2c_lock; /* Protect I2C controller regs */ unsigned char primary_i2c_slave; /* I2C write id of sensor */ |