diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-04-29 22:38:01 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-04-29 22:38:01 -0400 |
| commit | 49e1900d4cc2e7bcecb681fe60f0990bec2dcce8 (patch) | |
| tree | 253801ebf57e0a23856a2c7be129c2c178f62fdf /drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h | |
| parent | 34f6d749c0a328817d5e36274e53121c1db734dc (diff) | |
| parent | b9099ff63c75216d6ca10bce5a1abcd9293c27e6 (diff) | |
Merge branch 'linux-2.6' into for-2.6.22
Diffstat (limited to 'drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h')
| -rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h index 16bd74199601..ce66ab8ff2d8 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h +++ b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h | |||
| @@ -283,6 +283,8 @@ struct pvr2_hdw { | |||
| 283 | int unit_number; /* ID for driver instance */ | 283 | int unit_number; /* ID for driver instance */ |
| 284 | unsigned long serial_number; /* ID for hardware itself */ | 284 | unsigned long serial_number; /* ID for hardware itself */ |
| 285 | 285 | ||
| 286 | char bus_info[32]; /* Bus location info */ | ||
| 287 | |||
| 286 | /* Minor numbers used by v4l logic (yes, this is a hack, as there | 288 | /* Minor numbers used by v4l logic (yes, this is a hack, as there |
| 287 | should be no v4l junk here). Probably a better way to do this. */ | 289 | should be no v4l junk here). Probably a better way to do this. */ |
| 288 | int v4l_minor_number_video; | 290 | int v4l_minor_number_video; |