[platform][stellaris] rearrange some headers

platform/stellaris/include/ti_driverlib.h

@@ -47,12 +47,13 @@ __BEGIN_CDECLS
 
 #include "inc/hw_types.h"
 #include "inc/hw_sysctl.h"
+#include "inc/hw_memmap.h"
 
+#include "driverlib/gpio.h"
 #include "driverlib/pin_map.h"
 #include "driverlib/sysctl.h"
-#include "driverlib/uart.h"
-#include "driverlib/gpio.h"
 #include "driverlib/systick.h"
+#include "driverlib/uart.h"
 
 __END_CDECLS
 

platform/stellaris/init.c

@@ -25,9 +25,6 @@
 #include <debug.h>
 #include <platform.h>
 
-#include "ti/inc/hw_memmap.h"
-#include "ti/inc/hw_types.h"
-
 #include "ti_driverlib.h"
 
 

platform/stellaris/ti/rules.mk

@@ -1,6 +1,6 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
-MODULE_INCLUDES += -I$(LOCAL_DIR)
+INCLUDES += -I$(LOCAL_DIR)
 
 MODULE_SRCS += \
 	$(LOCAL_DIR)/driverlib/adc.c \