diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-31 02:19:48 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-31 02:19:48 -0500 |
| commit | 818fa7f3908c7bd6c0045e9d94dc23a899ef6144 (patch) | |
| tree | ad3435c3f57c8222ad61709b716168932f13be6c /drivers/media/dvb/dvb-core/dvbdev.h | |
| parent | 3fd4bc015ef879a7d2b955ce97fb125e3a51ba7e (diff) | |
| parent | 5fdf7e5975a0b0f6a0370655612c5dca3fd6311b (diff) | |
Merge branch 'tracing/kmemtrace' into tracing/kmemtrace2
Diffstat (limited to 'drivers/media/dvb/dvb-core/dvbdev.h')
| -rw-r--r-- | drivers/media/dvb/dvb-core/dvbdev.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/dvb/dvb-core/dvbdev.h b/drivers/media/dvb/dvb-core/dvbdev.h index 574e336bac35..dca49cf962e8 100644 --- a/drivers/media/dvb/dvb-core/dvbdev.h +++ b/drivers/media/dvb/dvb-core/dvbdev.h | |||
| @@ -74,6 +74,7 @@ struct dvb_device { | |||
| 74 | struct file_operations *fops; | 74 | struct file_operations *fops; |
| 75 | struct dvb_adapter *adapter; | 75 | struct dvb_adapter *adapter; |
| 76 | int type; | 76 | int type; |
| 77 | int minor; | ||
| 77 | u32 id; | 78 | u32 id; |
| 78 | 79 | ||
| 79 | /* in theory, 'users' can vanish now, | 80 | /* in theory, 'users' can vanish now, |