diff options
Diffstat (limited to 'include/media/saa7146.h')
-rw-r--r-- | include/media/saa7146.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/media/saa7146.h b/include/media/saa7146.h index 2a897c3a6a9a..e5be2b9b846b 100644 --- a/include/media/saa7146.h +++ b/include/media/saa7146.h | |||
@@ -14,7 +14,7 @@ | |||
14 | #include <linux/vmalloc.h> /* for vmalloc() */ | 14 | #include <linux/vmalloc.h> /* for vmalloc() */ |
15 | #include <linux/mm.h> /* for vmalloc_to_page() */ | 15 | #include <linux/mm.h> /* for vmalloc_to_page() */ |
16 | 16 | ||
17 | #define SAA7146_VERSION_CODE 0x000500 /* 0.5.0 */ | 17 | #define SAA7146_VERSION_CODE 0x000500 /* 0.5.0 */ |
18 | 18 | ||
19 | #define saa7146_write(sxy,adr,dat) writel((dat),(sxy->mem+(adr))) | 19 | #define saa7146_write(sxy,adr,dat) writel((dat),(sxy->mem+(adr))) |
20 | #define saa7146_read(sxy,adr) readl(sxy->mem+(adr)) | 20 | #define saa7146_read(sxy,adr) readl(sxy->mem+(adr)) |
@@ -112,7 +112,7 @@ struct saa7146_dev | |||
112 | 112 | ||
113 | /* different device locks */ | 113 | /* different device locks */ |
114 | spinlock_t slock; | 114 | spinlock_t slock; |
115 | struct semaphore lock; | 115 | struct semaphore lock; |
116 | 116 | ||
117 | unsigned char __iomem *mem; /* pointer to mapped IO memory */ | 117 | unsigned char __iomem *mem; /* pointer to mapped IO memory */ |
118 | int revision; /* chip revision; needed for bug-workarounds*/ | 118 | int revision; /* chip revision; needed for bug-workarounds*/ |
@@ -133,7 +133,7 @@ struct saa7146_dev | |||
133 | void (*vv_callback)(struct saa7146_dev *dev, unsigned long status); | 133 | void (*vv_callback)(struct saa7146_dev *dev, unsigned long status); |
134 | 134 | ||
135 | /* i2c-stuff */ | 135 | /* i2c-stuff */ |
136 | struct semaphore i2c_lock; | 136 | struct semaphore i2c_lock; |
137 | u32 i2c_bitrate; | 137 | u32 i2c_bitrate; |
138 | struct saa7146_dma d_i2c; /* pointer to i2c memory */ | 138 | struct saa7146_dma d_i2c; /* pointer to i2c memory */ |
139 | wait_queue_head_t i2c_wq; | 139 | wait_queue_head_t i2c_wq; |