From 7bb86bb365c170c089f5775ce6e60a8862d292da Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tobias@T-POWA-LX.(none)>
Date: Sun, 25 Jan 2009 17:31:48 +0100
Subject: [PATCH] 'fixed uvesafb file, added ehci loading before uhci ohci'

---
 lib/initcpio/hooks/arch_naim   | 7 -------
 lib/initcpio/install/arch_fb   | 2 +-
 lib/initcpio/install/arch_udev | 1 +
 3 files changed, 2 insertions(+), 8 deletions(-)
 delete mode 100644 lib/initcpio/hooks/arch_naim

diff --git a/lib/initcpio/hooks/arch_naim b/lib/initcpio/hooks/arch_naim
deleted file mode 100644
index 37cef21a4..000000000
--- a/lib/initcpio/hooks/arch_naim
+++ /dev/null
@@ -1,7 +0,0 @@
-run_hook ()
-{
-    # fix symlinks for naim
-    ln -s /usr/bin/naim /usr/bin/nirc
-    ln -s /usr/bin/naim /usr/bin/nicq
-    ln -s /usr/bin/naim /usr/bin/nlily
-}
diff --git a/lib/initcpio/install/arch_fb b/lib/initcpio/install/arch_fb
index 6d3901501..60aefbfd0 100644
--- a/lib/initcpio/install/arch_fb
+++ b/lib/initcpio/install/arch_fb
@@ -7,7 +7,7 @@ install ()
     BINARIES="v86d"
     FILES=""
     SCRIPT=""
-    add_file /usr/share/archboot/fb/etc/modprobe.d/uvesafb
+    add_file "/usr/share/archboot/fb/etc/modprobe.d/uvesafb" "/etc/modprobe.d/uvesafb"
 }
 
 help ()
diff --git a/lib/initcpio/install/arch_udev b/lib/initcpio/install/arch_udev
index 7d583da26..4dc417e53 100644
--- a/lib/initcpio/install/arch_udev
+++ b/lib/initcpio/install/arch_udev
@@ -7,6 +7,7 @@ install ()
     FILES="/etc/udev/udev.conf"
     SCRIPT="arch_udev"
     add_file /etc/modprobe.d/framebuffer_blacklist
+    add_file /etc/modprobe.d/usb-load-ehci-first 
     add_file /usr/share/archboot/udev/etc/load-modules.sh /lib/udev/load-modules.sh
     add_file /lib/udev/ata_id
     add_file /lib/udev/cdrom_id