diff options
| author | John Lee <john_lee@openmoko.org> | 2008-03-07 12:39:27 +0000 |
|---|---|---|
| committer | John Lee <john_lee@openmoko.org> | 2008-03-07 12:39:27 +0000 |
| commit | e906546390539db91733531aa8007a59fcc3b60f (patch) | |
| tree | 2d89a492846a2c0b4310abad9d943eee71d0e494 /packages/openmoko2/openmoko-dialer2 | |
| parent | 5a42b280d244be8ddc18eb07826a7cf4c3c605c1 (diff) | |
solving merge conflict
Diffstat (limited to 'packages/openmoko2/openmoko-dialer2')
4 files changed, 0 insertions, 28 deletions
diff --git a/packages/openmoko2/openmoko-dialer2/fic-gta01/.mtn2git_empty b/packages/openmoko2/openmoko-dialer2/fic-gta01/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/openmoko2/openmoko-dialer2/fic-gta01/.mtn2git_empty +++ /dev/null diff --git a/packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch b/packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch deleted file mode 100644 index c6f34f4131..0000000000 --- a/packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: openmoko-dialer2/src/phone-kit/moko-notify.c -=================================================================== ---- openmoko-dialer2/src/phone-kit/moko-notify.c.orig 2008-02-14 17:47:23.000000000 +0800 -+++ openmoko-dialer2/src/phone-kit/moko-notify.c 2008-02-14 17:48:19.000000000 +0800 -@@ -38,7 +38,7 @@ - - #define DEFAULT_RINGTONE "/default_ringtone.ogg" - #define SYS_BRIGHTNESS "/sys/class/backlight/gta01-bl" --#define SYS_VIBRATE "/sys/class/leds/gta01:vibrator" -+#define SYS_VIBRATE "/sys/class/leds/neo1973:vibrator" - - struct _MokoNotifyPrivate - { diff --git a/packages/openmoko2/openmoko-dialer2/fic-gta02/.mtn2git_empty b/packages/openmoko2/openmoko-dialer2/fic-gta02/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/openmoko2/openmoko-dialer2/fic-gta02/.mtn2git_empty +++ /dev/null diff --git a/packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch b/packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch deleted file mode 100644 index 72c516f5d6..0000000000 --- a/packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: openmoko-dialer2/src/phone-kit/moko-notify.c -=================================================================== ---- openmoko-dialer2/src/phone-kit/moko-notify.c (revision 4051) -+++ openmoko-dialer2/src/phone-kit/moko-notify.c (working copy) -@@ -37,8 +37,8 @@ - MOKO_TYPE_NOTIFY, MokoNotifyPrivate)) - - #define DEFAULT_RINGTONE "/default_ringtone.ogg" --#define SYS_BRIGHTNESS "/sys/class/backlight/gta01-bl" --#define SYS_VIBRATE "/sys/class/leds/gta01:vibrator" -+#define SYS_BRIGHTNESS "/sys/class/backlight/pcf50633-bl" -+#define SYS_VIBRATE "/sys/class/leds/neo1973:vibrator" - - struct _MokoNotifyPrivate - { |