diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2008-07-29 00:07:55 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-29 00:07:55 +0200 |
| commit | cb28a1bbdb4790378e7366d6c9ee1d2340b84f92 (patch) | |
| tree | 316436f77dac75335fd2c3ef5f109e71606c50d3 /drivers/media/video/mt9v022.c | |
| parent | dma-coherent: add documentation to new interfaces (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input (diff) | |
| download | linux-dev-cb28a1bbdb4790378e7366d6c9ee1d2340b84f92.tar.xz linux-dev-cb28a1bbdb4790378e7366d6c9ee1d2340b84f92.zip | |
Merge branch 'linus' into core/generic-dma-coherent
Conflicts:
arch/x86/Kconfig
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/media/video/mt9v022.c')
| -rw-r--r-- | drivers/media/video/mt9v022.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/mt9v022.c b/drivers/media/video/mt9v022.c index 1658fe590392..b31ba4e09327 100644 --- a/drivers/media/video/mt9v022.c +++ b/drivers/media/video/mt9v022.c @@ -815,7 +815,6 @@ static int mt9v022_remove(struct i2c_client *client) return 0; } - static const struct i2c_device_id mt9v022_id[] = { { "mt9v022", 0 }, { } |