diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-29 05:54:24 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-29 05:54:24 -0400 |
| commit | 3825c9e8d01e4310c40a3903a354c433c32a7b6f (patch) | |
| tree | 87c94a8076bbb38bd2cf20ab9bc23d6f74f6a0a8 /drivers/media/video/zoran_card.h | |
| parent | 5d7b605245b1aa1a9cd6549b1f57d69273eb0c37 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge commit 'v2.6.27-rc1' into x86/microcode
Conflicts:
arch/x86/kernel/microcode.c
Manual resolutions:
arch/x86/kernel/microcode_amd.c
arch/x86/kernel/microcode_intel.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/media/video/zoran_card.h')
| -rw-r--r-- | drivers/media/video/zoran_card.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/zoran_card.h b/drivers/media/video/zoran_card.h index 1b5c4171cf9c..e4dc9d29b404 100644 --- a/drivers/media/video/zoran_card.h +++ b/drivers/media/video/zoran_card.h | |||
| @@ -41,7 +41,7 @@ extern int zr36067_debug; | |||
| 41 | /* Anybody who uses more than four? */ | 41 | /* Anybody who uses more than four? */ |
| 42 | #define BUZ_MAX 4 | 42 | #define BUZ_MAX 4 |
| 43 | extern int zoran_num; | 43 | extern int zoran_num; |
| 44 | extern struct zoran zoran[BUZ_MAX]; | 44 | extern struct zoran *zoran[BUZ_MAX]; |
| 45 | 45 | ||
| 46 | extern struct video_device zoran_template; | 46 | extern struct video_device zoran_template; |
| 47 | 47 | ||