Merge branch 'master' of git+ssh://master.kernel.org/pub/scm/linux/hotplug/udev

diff --combined configure.ac
index b5754f2ac26a249303375762a5b3f1c5a220749e,c7885b01624b14113f39193cf3c18ec4ee2eb8e8..caeb741319890ed9482fd9e35538e7c8c596b570
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -1,4 -1,4 +1,4 @@@
 -AC_INIT([udev], [166], [linux-hotplug@vger.kernel.org])
 +AC_INIT([udev], [167], [linux-hotplug@vger.kernel.org])
  AC_PREREQ(2.60)
  AM_INIT_AUTOMAKE([check-news foreign 1.10 dist-bzip2 subdir-objects])
  m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@@ -118,6 -118,9 +118,9 @@@ if test "x$enable_extras" = xyes; the
  fi
  AM_CONDITIONAL([ENABLE_EXTRAS], [test "x$enable_extras" = xyes])
  
+ AC_CHECK_HEADER([linux/videodev.h], [have_videodev_h=yes], [])
+ AM_CONDITIONAL(HAVE_V4L1, [test "x$have_videodev_h" = "xyes"])
+ 
  AC_ARG_ENABLE([introspection],
        AS_HELP_STRING([--disable-introspection], [disable GObject introspection]),
        [], [enable_introspection=yes])