diff options
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/compat.h | 13 | ||||
| -rwxr-xr-x | v4l/scripts/make_kconfig.pl | 1 | ||||
| -rw-r--r-- | v4l/versions.txt | 2 |
3 files changed, 16 insertions, 0 deletions
diff --git a/v4l/compat.h b/v4l/compat.h index 6e90c0e63..0e2ccd7a9 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -237,4 +237,17 @@ static inline int list_is_singular(const struct list_head *head) #define current_uid() (current->uid) #endif +#ifndef WARN +#define WARN(condition, format...) ({ \ + int __ret_warn_on = !!(condition); \ + if (unlikely(__ret_warn_on)) \ + printk(KERN_WARNING format); \ + unlikely(__ret_warn_on); \ +}) +#endif + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 28) +#define snd_BUG_ON(cond) WARN((cond), "BUG? (%s)\n", __stringify(cond)) +#endif + #endif diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl index 20b94f0c1..7c259eeb6 100755 --- a/v4l/scripts/make_kconfig.pl +++ b/v4l/scripts/make_kconfig.pl @@ -582,6 +582,7 @@ disable_config('DVB_AV7110_FIRMWARE'); disable_config('DVB_CINERGYT2_TUNING'); disable_config('DVB_FE_CUSTOMISE'); disable_config('VIDEO_HELPER_CHIPS_AUTO'); +disable_config('VIDEO_FIXED_MINOR_RANGES'); # Check dependencies my %newconfig = checkdeps(); diff --git a/v4l/versions.txt b/v4l/versions.txt index d3efd816a..e61a9aac2 100644 --- a/v4l/versions.txt +++ b/v4l/versions.txt @@ -20,6 +20,8 @@ USB_STKWEBCAM USB_VIDEO_CLASS # This driver needs div64_64 DVB_DRX397XD +# Assumes struct input_dev has a dev field +DVB_DM1105 [2.6.20] #This driver requires HID_REQ_GET_REPORT |