diff options
| author |   Graeme Gregory <dp@xora.org.uk> | 2009-08-13 17:30:51 +0100 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2009-08-13 17:30:51 +0100 |
| commit | 321f298f4b9477ce563eeef68d82a28366788a52 (patch) | |
| tree | 85d4fbfd46068eaca77311382a6ad99e0191dec9 /recipes/freesmartphone/frameworkd/om-3d7k/frameworkd.conf | |
| parent | 819073c07c1deaac6143bb6eeea96a35a76451b5 (diff) | |
| parent | 94a9ba7988f0d6586ecaf0b722d6b320cfdf94ae (diff) | |
| download | openembedded-321f298f4b9477ce563eeef68d82a28366788a52.tar.gz | |
Merge branch 'org.openembedded.dev' of /home/dp/openembedded/org.openembedded.dev into xora/angstrom-srcpv
Conflicts:
recipes/clutter/clutter-0.9_git.bb
recipes/clutter/clutter-gst-0.9_git.bb
recipes/efl1/edje_svn.bb
recipes/efl1/embryo_svn.bb
recipes/efl1/emotion_svn.bb
recipes/freesmartphone/cornucopia.inc
recipes/freesmartphone/dbus-hlid_git.bb
recipes/freesmartphone/frameworkd-devel_git.bb
recipes/freesmartphone/frameworkd_git.bb
recipes/freesmartphone/fso-abyss_git.bb
recipes/freesmartphone/fso-monitord_git.bb
recipes/freesmartphone/fso-sounds.bb
recipes/freesmartphone/fsod_git.bb
recipes/freesmartphone/libframeworkd-glib_git.bb
recipes/freesmartphone/libgsm0710mux_git.bb
recipes/freesmartphone/vala-dbus-binding-tool-native_git.bb
recipes/linux/linux-davinci_git.bb
recipes/opencv/opencv-samples_svn.bb
recipes/opencv/opencv_svn.bb
recipes/u-boot/u-boot_git.bb
recipes/uclibc/uclibc_git.bb
recipes/uclibc/uclibc_nptl.bb
recipes/wmiconfig/wmiconfig_svn.bb
Diffstat (limited to 'recipes/freesmartphone/frameworkd/om-3d7k/frameworkd.conf')
| -rw-r--r-- | recipes/freesmartphone/frameworkd/om-3d7k/frameworkd.conf | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/recipes/freesmartphone/frameworkd/om-3d7k/frameworkd.conf b/recipes/freesmartphone/frameworkd/om-3d7k/frameworkd.conf deleted file mode 100644 index d48bc0815c..0000000000 --- a/recipes/freesmartphone/frameworkd/om-3d7k/frameworkd.conf +++ /dev/null @@ -1,30 +0,0 @@ -[frameworkd] -version = 1 -log_level = INFO -log_to = syslog - -[odeviced.audio] -# set default alsa scenario -default_scenario = stereoout -# set path to alsa scenario files -scenario_dir = /usr/share/openmoko/scenarios - -[odeviced.input] -# Keys -report1 = AUX,key,169,1 -report2 = POWER,key,116,1 -report3 = USB,key,356,0 -report4 = HEADSET,switch,2,0 - -[ogsmd] -# GTA03 has a Cinterion MC75i -modemtype = cinterion_mc75 - -[ogpsd] -disable = 1 - -[opreferencesd] -rootdir = ../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/usr/etc/freesmartphone/opreferences - -[oeventsd] -rules_file = ../etc/freesmartphone/oevents/rules.yaml:/etc/freesmartphone/oevents/rules.yaml:/usr/etc/freesmartphone/oevents/rules.yaml |