diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
| commit | 64e47488c913ac704d465a6af86a26786d1412a5 (patch) | |
| tree | d3b0148592963dcde26e4bb35ddfec8b1eaf8e23 /drivers/media/video/saa7185.c | |
| parent | 4a35a46bf1cda4737c428380d1db5d15e2590d18 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge linux-2.6 with linux-acpi-2.6
Diffstat (limited to 'drivers/media/video/saa7185.c')
| -rw-r--r-- | drivers/media/video/saa7185.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/media/video/saa7185.c b/drivers/media/video/saa7185.c index 108e7a4a0273..132aa7943c16 100644 --- a/drivers/media/video/saa7185.c +++ b/drivers/media/video/saa7185.c | |||
| @@ -39,7 +39,6 @@ | |||
| 39 | #include <asm/pgtable.h> | 39 | #include <asm/pgtable.h> |
| 40 | #include <asm/page.h> | 40 | #include <asm/page.h> |
| 41 | #include <linux/sched.h> | 41 | #include <linux/sched.h> |
| 42 | #include <asm/segment.h> | ||
| 43 | #include <linux/types.h> | 42 | #include <linux/types.h> |
| 44 | 43 | ||
| 45 | #include <linux/videodev.h> | 44 | #include <linux/videodev.h> |
| @@ -387,7 +386,6 @@ static struct i2c_client_address_data addr_data = { | |||
| 387 | .normal_i2c = normal_i2c, | 386 | .normal_i2c = normal_i2c, |
| 388 | .probe = &ignore, | 387 | .probe = &ignore, |
| 389 | .ignore = &ignore, | 388 | .ignore = &ignore, |
| 390 | .force = &ignore, | ||
| 391 | }; | 389 | }; |
| 392 | 390 | ||
| 393 | static struct i2c_driver i2c_driver_saa7185; | 391 | static struct i2c_driver i2c_driver_saa7185; |