--- a/arch/arm/mach-cns3xxx/core.c
+++ b/arch/arm/mach-cns3xxx/core.c
-@@ -115,12 +115,13 @@ static void cns3xxx_timer_set_mode(enum
+@@ -115,12 +115,13 @@ static void cns3xxx_timer_set_mode(enum
switch (mode) {
case CLOCK_EVT_MODE_PERIODIC:
};
struct port {
-@@ -500,37 +508,35 @@ static void cns3xxx_alloc_rx_buf(struct
+@@ -500,37 +508,35 @@ static void cns3xxx_alloc_rx_buf(struct
struct _rx_ring *rx_ring = sw->rx_ring;
unsigned int i = rx_ring->alloc_index;
struct rx_desc *desc = &(rx_ring)->desc[i];