From 7d202ed048cea6d35a167afc7ae3438088d865d2 Mon Sep 17 00:00:00 2001
From: Xiangfu Liu <xiangfu@sharism.cc>
Date: Thu, 25 Aug 2011 08:08:56 +0800
Subject: [PATCH] not working without asound.conf, asound.conf make MIC not
 working Revert "nanonote-files add system volume control thanks EdorFaus"

This reverts commit dab010aecbf3893ab73c94d679f7293e29465b11.
---
 ...-fix-conflict-with-system-volume-control.patch | 15 ---------------
 .../etc/triggerhappy/triggers.d/volume.conf       |  2 --
 2 files changed, 17 deletions(-)
 delete mode 100644 gmu/patches/002-fix-conflict-with-system-volume-control.patch
 delete mode 100644 nanonote-files/script-files/etc/triggerhappy/triggers.d/volume.conf

diff --git a/gmu/patches/002-fix-conflict-with-system-volume-control.patch b/gmu/patches/002-fix-conflict-with-system-volume-control.patch
deleted file mode 100644
index af87c04..0000000
--- a/gmu/patches/002-fix-conflict-with-system-volume-control.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/nanonote.keymap b/nanonote.keymap
-index 324ae67..d2081b0 100644
---- a/nanonote.keymap
-+++ b/nanonote.keymap
-@@ -11,8 +11,8 @@ Left=Left
- Right=Right
- Up=Up
- Down=Down
--IncreaseVolume=Vol+
--DecreaseVolume=Vol-
-+IncreaseVolume=Mod+Vol+
-+DecreaseVolume=Mod+Vol-
- ToggleTime=T
- Pause=P
- Stop=Mod+X
diff --git a/nanonote-files/script-files/etc/triggerhappy/triggers.d/volume.conf b/nanonote-files/script-files/etc/triggerhappy/triggers.d/volume.conf
deleted file mode 100644
index 50ef05a..0000000
--- a/nanonote-files/script-files/etc/triggerhappy/triggers.d/volume.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-KEY_VOLUMEUP	1	/usr/bin/amixer sset PCM 5%+
-KEY_VOLUMEDOWN	1	/usr/bin/amixer sset PCM 5%-