diff options
author | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
commit | d120cfb544ed6161b9d32fb6c4648c471807ee6b (patch) | |
tree | 7757ad0198d8df76ff5c60f939a687687c41da00 /include/media/v4l2-dev.h | |
parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
parent | bf7e8511088963078484132636839b59e25cf14f (diff) |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'include/media/v4l2-dev.h')
-rw-r--r-- | include/media/v4l2-dev.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h index a1b473190e65..62dae1a8c441 100644 --- a/include/media/v4l2-dev.h +++ b/include/media/v4l2-dev.h | |||
@@ -314,7 +314,6 @@ void *priv; | |||
314 | /* for videodev.c intenal usage -- please don't touch */ | 314 | /* for videodev.c intenal usage -- please don't touch */ |
315 | int users; /* video_exclusive_{open|close} ... */ | 315 | int users; /* video_exclusive_{open|close} ... */ |
316 | struct mutex lock; /* ... helper function uses these */ | 316 | struct mutex lock; /* ... helper function uses these */ |
317 | char devfs_name[64]; /* devfs */ | ||
318 | struct class_device class_dev; /* sysfs */ | 317 | struct class_device class_dev; /* sysfs */ |
319 | }; | 318 | }; |
320 | 319 | ||