From cbf3ef91305558fb8a59e19c5987a9e9ca22013a Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Mon, 10 Oct 2005 10:41:35 +0000
Subject: Merge changes from mainline OE to try and keep us in sync.

git-svn-id: https://svn.o-hand.com/repos/poky@127 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 openembedded/packages/udev/files/init       | 4 +++-
 openembedded/packages/udev/files/udev.rules | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'openembedded/packages/udev/files')

diff --git a/openembedded/packages/udev/files/init b/openembedded/packages/udev/files/init
index c290661c7..6ad6fd581 100755
--- a/openembedded/packages/udev/files/init
+++ b/openembedded/packages/udev/files/init
@@ -52,7 +52,9 @@ mount_tmpfs() {
 
   mkdir -p /dev/.static/dev
   chmod 700 /dev/.static/
-  mount -n -o move /etc/udev /dev/.static/dev
+  # Make sure it's busybox mount we're using. util-linux mount doesn't handle
+  # -o move. 
+  busybox mount -n -o move /etc/udev /dev/.static/dev
 }
 
 # I hate this hack.  -- Md
diff --git a/openembedded/packages/udev/files/udev.rules b/openembedded/packages/udev/files/udev.rules
index 4fc82ba25..044ababa7 100644
--- a/openembedded/packages/udev/files/udev.rules
+++ b/openembedded/packages/udev/files/udev.rules
@@ -54,6 +54,8 @@ KERNEL=="issm*",		NAME="infiniband/%k"
 KERNEL=="uverbs*",		NAME="infiniband/%k"
 KERNEL=="ucm",			NAME="infiniband/%k"
 
+KERNEL=="buzzer",		NAME="misc/buzzer"
+
 # ALSA devices
 KERNEL=="controlC[0-9]*",	NAME="snd/%k"
 KERNEL=="hwC[D0-9]*",		NAME="snd/%k"
-- 
cgit v1.2.3