diff options
author | Alexander Tarasikov <alexander.tarasikov@gmail.com> | 2012-08-24 20:24:35 +0400 |
---|---|---|
committer | Alexander Tarasikov <alexander.tarasikov@gmail.com> | 2012-08-24 20:24:35 +0400 |
commit | 554a526381db5cda5dda5724e8fcbe94fca6f3d9 (patch) | |
tree | 3b79dec643be682d7ed1bd0edb4ab0a37feb9f7a /samsung-ril.c | |
parent | ccf9b863a3f5b118b13c54f030ef7a77e672d758 (diff) | |
parent | c4d12a5c5bcb5fe29fb13e9afa23975af3fbb63b (diff) | |
download | hardware_replicant_libsamsung-ril-554a526381db5cda5dda5724e8fcbe94fca6f3d9.tar.gz hardware_replicant_libsamsung-ril-554a526381db5cda5dda5724e8fcbe94fca6f3d9.tar.bz2 hardware_replicant_libsamsung-ril-554a526381db5cda5dda5724e8fcbe94fca6f3d9.zip |
Merge remote-tracking branch 'ksys/master' into replicant-merge
Conflicts:
gprs.c
net.c
Diffstat (limited to 'samsung-ril.c')
-rw-r--r-- | samsung-ril.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/samsung-ril.c b/samsung-ril.c index cfd7f20..daa756a 100644 --- a/samsung-ril.c +++ b/samsung-ril.c @@ -541,7 +541,7 @@ void ril_state_lpm(void) static const RIL_RadioFunctions ril_ops = { - RIL_VERSION, + SAMSUNG_RIL_VERSION, onRequest, currentState, onSupports, |