summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorPaul Sokolovsky <pmiscml@gmail.com>2007-01-10 00:46:11 +0000
committerPaul Sokolovsky <pmiscml@gmail.com>2007-01-10 00:46:11 +0000
commitd129ed5540f4fa117af8cb15d41620bf341f5bf9 (patch)
tree6104362e740c096ef65c302d90f64bb104377122 /packages
parenta021c40299b8baa7b647529b24288f5b989c4b20 (diff)
parent5d1517dade26555e922a6c7350ee20d7798aa803 (diff)
merge of '0d29fdd2446b98bacd9f567cb97f1e7cba3a69b9'
and '3c16e1782478226564fd2d3b64c57dbcf099ed1e'
Diffstat (limited to 'packages')
-rw-r--r--packages/linux/linux-handhelds-2.6/magician/defconfig4
-rw-r--r--packages/tslib/tslib/magician/.mtn2git_empty0
-rw-r--r--packages/tslib/tslib/magician/tslib.sh6
3 files changed, 2 insertions, 8 deletions
diff --git a/packages/linux/linux-handhelds-2.6/magician/defconfig b/packages/linux/linux-handhelds-2.6/magician/defconfig
index c47caaefd3..f6572cad55 100644
--- a/packages/linux/linux-handhelds-2.6/magician/defconfig
+++ b/packages/linux/linux-handhelds-2.6/magician/defconfig
@@ -988,8 +988,8 @@ CONFIG_SND=m
CONFIG_SND_TIMER=m
CONFIG_SND_PCM=m
# CONFIG_SND_SEQUENCER is not set
-# CONFIG_SND_MIXER_OSS is not set
-# CONFIG_SND_PCM_OSS is not set
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
# CONFIG_SND_DYNAMIC_MINORS is not set
# CONFIG_SND_SUPPORT_OLD_API is not set
CONFIG_SND_VERBOSE_PROCFS=y
diff --git a/packages/tslib/tslib/magician/.mtn2git_empty b/packages/tslib/tslib/magician/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/tslib/tslib/magician/.mtn2git_empty
+++ /dev/null
diff --git a/packages/tslib/tslib/magician/tslib.sh b/packages/tslib/tslib/magician/tslib.sh
deleted file mode 100644
index 586d5c7deb..0000000000
--- a/packages/tslib/tslib/magician/tslib.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-TSLIB_TSDEVICE=/dev/input/touchscreen0
-TSLIB_CONFFILE=/etc/ts.conf
-
-export TSLIB_TSDEVICE TSLIB_CONFFILE