From 96cfd4105e8c5ab7d205548baa0216715c0202c2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Jul 2008 21:16:29 +0000
Subject: [PATCH] * Revert accidental commit.

svn path=/nixos/trunk/; revision=12247
---
 upstart-jobs/xserver.conf | 1 -
 upstart-jobs/xserver.nix  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/upstart-jobs/xserver.conf b/upstart-jobs/xserver.conf
index a1f6f3552d9..98f98f481f9 100644
--- a/upstart-jobs/xserver.conf
+++ b/upstart-jobs/xserver.conf
@@ -16,7 +16,6 @@ Section "Module"
   Load "bitmap"
   Load "int10"
   Load "vbe"
-  Load "v4l"
   @moduleSection@
   @extraModules@
 EndSection
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index c18d4f9690c..2d81d25c225 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -41,7 +41,6 @@ let
       xorg.xorgserver
       xorg.xf86inputkeyboard
       xorg.xf86inputmouse
-      xorg.xf86videov4l
     ] 
     ++ optional (videoDriver == "vesa") xorg.xf86videovesa
     ++ optional (videoDriver == "vga") xorg.xf86videovga