diff options
author | Philipp Zabel <philipp.zabel@gmail.com> | 2007-01-09 20:07:40 +0000 |
---|---|---|
committer | Philipp Zabel <philipp.zabel@gmail.com> | 2007-01-09 20:07:40 +0000 |
commit | 6a0c3e066006f6e8be669fc4af6ece8749cebe75 (patch) | |
tree | 0f43609488992e0f6589fab8cfe1a626d3a79a07 /packages | |
parent | 5e0ab027e1cd26311bc4b9053cb65d5b4a003029 (diff) | |
parent | 9c5a46c4cea7660dfd7ea500d1bca633c4eb8ed5 (diff) |
merge of '23b499709c194edb8a59cac3432c10a63e6a952d'
and '936fcb645dcae65ff05db814bd104083a0194fb0'
Diffstat (limited to 'packages')
-rw-r--r-- | packages/linux/linux-handhelds-2.6/magician/defconfig | 4 | ||||
-rw-r--r-- | packages/tslib/tslib/magician/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/tslib/tslib/magician/tslib.sh | 6 |
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 |