diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
| commit | 5042ac8e5927d0089d3902b1c37e5bcc1565d053 (patch) | |
| tree | cd2be3085808c5ac59dd70f9c610c6a40bfe3ffd /package/bluez/patches/patch-tools_hciattach_c | |
| parent | 401dabf66529cfb5ab47b4c78d5e25fd493eef1f (diff) | |
| parent | 4d569ed1a3305c7b7abe8fa4273cea3b559cc85a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
BUGS
package/autoconf/Makefile
Diffstat (limited to 'package/bluez/patches/patch-tools_hciattach_c')
| -rw-r--r-- | package/bluez/patches/patch-tools_hciattach_c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/package/bluez/patches/patch-tools_hciattach_c b/package/bluez/patches/patch-tools_hciattach_c index ae8f70f57..e5a84de4f 100644 --- a/package/bluez/patches/patch-tools_hciattach_c +++ b/package/bluez/patches/patch-tools_hciattach_c @@ -1,7 +1,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- bluez-4.12.orig/tools/hciattach.c 2008-08-05 23:14:56.000000000 +0200 -+++ bluez-4.12/tools/hciattach.c 2009-05-12 18:14:29.000000000 +0200 -@@ -107,6 +107,7 @@ static int uart_speed(int s) +--- bluez-4.59.orig/tools/hciattach.c Tue May 19 11:04:10 2009 ++++ bluez-4.59/tools/hciattach.c Tue Dec 29 01:26:35 2009 +@@ -100,6 +100,7 @@ static int uart_speed(int s) return B57600; case 115200: return B115200; @@ -9,7 +9,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ case 230400: return B230400; case 460800: -@@ -125,6 +126,7 @@ static int uart_speed(int s) +@@ -118,6 +119,7 @@ static int uart_speed(int s) return B1500000; case 2000000: return B2000000; |