From dae1073f133395ce6bf473c852da624c475a6cc3 Mon Sep 17 00:00:00 2001
From: Denis Kenzior <denkenz@gmail.com>
Date: Fri, 4 Dec 2015 13:43:58 -0600
Subject: rilmodem: Don't include grilunsol.h

---
 drivers/rilmodem/gprs-context.c         | 4 ++--
 drivers/rilmodem/gprs.c                 | 6 +++---
 drivers/rilmodem/network-registration.c | 5 ++---
 drivers/rilmodem/sim.c                  | 9 +++------
 drivers/rilmodem/voicecall.c            | 3 +--
 5 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/drivers/rilmodem/gprs-context.c b/drivers/rilmodem/gprs-context.c
index 286c48e4..734211e5 100644
--- a/drivers/rilmodem/gprs-context.c
+++ b/drivers/rilmodem/gprs-context.c
@@ -38,9 +38,9 @@
 #include <ofono/gprs-context.h>
 #include <ofono/types.h>
 
-#include "ofono.h"
+#include <gril/gril.h>
 
-#include "grilunsol.h"
+#include "ofono.h"
 
 #include "rilmodem.h"
 
diff --git a/drivers/rilmodem/gprs.c b/drivers/rilmodem/gprs.c
index 0f476fb1..19202856 100644
--- a/drivers/rilmodem/gprs.c
+++ b/drivers/rilmodem/gprs.c
@@ -39,12 +39,12 @@
 #include <ofono/gprs.h>
 #include <ofono/types.h>
 
-#include "gril.h"
-#include "grilutil.h"
+#include <gril/gril.h>
+#include <gril/grilutil.h>
+
 #include "common.h"
 #include "rilmodem.h"
 
-#include "grilunsol.h"
 #include "gprs.h"
 
 /* Time between get data status retries */
diff --git a/drivers/rilmodem/network-registration.c b/drivers/rilmodem/network-registration.c
index 41dc8eaa..8ba4dbb2 100644
--- a/drivers/rilmodem/network-registration.c
+++ b/drivers/rilmodem/network-registration.c
@@ -37,12 +37,11 @@
 #include <ofono/modem.h>
 #include <ofono/netreg.h>
 
+#include <gril/gril.h>
+
 #include "common.h"
-#include "gril.h"
 #include "rilmodem.h"
 
-#include "grilunsol.h"
-
 struct netreg_data {
 	GRil *ril;
 	char mcc[OFONO_MAX_MCC_LENGTH + 1];
diff --git a/drivers/rilmodem/sim.c b/drivers/rilmodem/sim.c
index ada7c20b..fcf9ee98 100644
--- a/drivers/rilmodem/sim.c
+++ b/drivers/rilmodem/sim.c
@@ -37,19 +37,16 @@
 #include <ofono/modem.h>
 #include <ofono/sim.h>
 
+#include <gril/gril.h>
+#include <gril/grilutil.h>
+
 #include "ofono.h"
 
 #include "simutil.h"
 #include "util.h"
 
-#include "gril.h"
-#include "grilutil.h"
-#include "parcel.h"
-#include "ril_constants.h"
 #include "rilmodem.h"
 
-#include "grilunsol.h"
-
 #include <drivers/infineonmodem/infineon_constants.h>
 
 /* Number of passwords in EPINC response */
diff --git a/drivers/rilmodem/voicecall.c b/drivers/rilmodem/voicecall.c
index 346754ac..8515ebbd 100644
--- a/drivers/rilmodem/voicecall.c
+++ b/drivers/rilmodem/voicecall.c
@@ -39,8 +39,7 @@
 #include <ofono/modem.h>
 #include <ofono/voicecall.h>
 
-#include "gril.h"
-#include "grilunsol.h"
+#include <gril/gril.h>
 
 #include "common.h"
 #include "rilmodem.h"
-- 
cgit v1.2.3