Building linux kernel (3.14-rc) fails in spi-mxs.c

[tkoskine]

When building the latest minifs (commit 0bd7080) with a patch for issue 10 (slightly modified kernel config), the kernel building fails in spi-mxs.c:

/home/tkoskine/work/olinuxino/imx233-minifs/minifs-3/build-imx233/linux/drivers/spi/spi-mxs.c:70:1: error: expected specifier-qualifier-list before '<<' token
 <<<<<<<
 ^
/home/tkoskine/work/olinuxino/imx233-minifs/minifs-3/build-imx233/linux/drivers/spi/spi-mxs.c: In function 'mxs_spi_setup_transfer':
/home/tkoskine/work/olinuxino/imx233-minifs/minifs-3/build-imx233/linux/drivers/spi/spi-mxs.c:91:15: error: 'struct mxs_spi' has no member named 'sck'
  if (hz != spi->sck) {
               ^
/home/tkoskine/work/olinuxino/imx233-minifs/minifs-3/build-imx233/linux/drivers/spi/spi-mxs.c:98:6: error: 'struct mxs_spi' has no member named 'sck'
   spi->sck = hz;
      ^
/home/tkoskine/work/olinuxino/imx233-minifs/minifs-3/build-imx233/linux/drivers/spi/spi-mxs.c: In function 'mxs_spi_transfer_one':
/home/tkoskine/work/olinuxino/imx233-minifs/minifs-3/build-imx233/linux/drivers/spi/spi-mxs.c:390:1: error: expected expression before '<<' token
 <<<<<<<
 ^
/home/tkoskine/work/olinuxino/imx233-minifs/minifs-3/build-imx233/linux/drivers/spi/spi-mxs.c:394:9: error: 'struct mxs_spi' has no member named 'csmuxcount'
  if (spi->csmuxcount) {
         ^
/home/tkoskine/work/olinuxino/imx233-minifs/minifs-3/build-imx233/linux/drivers/spi/spi-mxs.c:396:22: error: 'struct mxs_spi' has no member named 'csmuxcount'
   for (i = 0; i < spi->csmuxcount; i++)
                      ^
/home/tkoskine/work/olinuxino/imx233-minifs/minifs-3/build-imx233/linux/drivers/spi/spi-mxs.c:397:22: error: 'struct mxs_spi' has no member named 'csmux'
    gpio_set_value(spi->csmux[i], (cs >> i) & 1);
                      ^
/home/tkoskine/work/olinuxino/imx233-minifs/minifs-3/build-imx233/linux/drivers/spi/spi-mxs.c:397:35: error: 'cs' undeclared (first use in this function)
    gpio_set_value(spi->csmux[i], (cs >> i) & 1);
                                   ^
/home/tkoskine/work/olinuxino/imx233-minifs/minifs-3/build-imx233/linux/drivers/spi/spi-mxs.c:397:35: note: each undeclared identifier is reported only once for each function it appears in
/home/tkoskine/work/olinuxino/imx233-minifs/minifs-3/build-imx233/linux/drivers/spi/spi-mxs.c:401:1: error: expected expression before '>>' token
 >>>>>>>
 ^
/home/tkoskine/work/olinuxino/imx233-minifs/minifs-3/build-imx233/linux/drivers/spi/spi-mxs.c:381:15: warning: unused variable 'flag' [-Wunused-variable]
  unsigned int flag;
               ^
/home/tkoskine/work/olinuxino/imx233-minifs/minifs-3/build-imx233/linux/drivers/spi/spi-mxs.c:380:27: warning: unused variable 'tmp_t' [-Wunused-variable]
  struct spi_transfer *t, *tmp_t;
                           ^
/home/tkoskine/work/olinuxino/imx233-minifs/minifs-3/build-imx233/linux/drivers/spi/spi-mxs.c:380:23: warning: unused variable 't' [-Wunused-variable]
  struct spi_transfer *t, *tmp_t;
                       ^
/home/tkoskine/work/olinuxino/imx233-minifs/minifs-3/build-imx233/linux/drivers/spi/spi-mxs.c: In function 'mxs_spi_probe':
/home/tkoskine/work/olinuxino/imx233-minifs/minifs-3/build-imx233/linux/drivers/spi/spi-mxs.c:543:6: error: 'struct mxs_spi' has no member named 'csmuxcount'
   spi->csmuxcount = of_gpio_named_count(np, "bsi,csmux");
      ^
/home/tkoskine/work/olinuxino/imx233-minifs/minifs-3/build-imx233/linux/drivers/spi/spi-mxs.c:544:10: error: 'struct mxs_spi' has no member named 'csmuxcount'
   if (spi->csmuxcount > 0) {
          ^
/home/tkoskine/work/olinuxino/imx233-minifs/minifs-3/build-imx233/linux/drivers/spi/spi-mxs.c:545:64: error: 'struct mxs_spi' has no member named 'csmuxcount'
    printk("BSI: mxs_spi_probe found %d chipselect gpios\n", spi->csmuxcount);
                                                                ^
/home/tkoskine/work/olinuxino/imx233-minifs/minifs-3/build-imx233/linux/drivers/spi/spi-mxs.c:546:23: error: 'struct mxs_spi' has no member named 'csmuxcount'
    for (i = 0; i < spi->csmuxcount; i++) {
                       ^
/home/tkoskine/work/olinuxino/imx233-minifs/minifs-3/build-imx233/linux/drivers/spi/spi-mxs.c:547:8: error: 'struct mxs_spi' has no member named 'csmux'
     spi->csmux[i] =
        ^
/home/tkoskine/work/olinuxino/imx233-minifs/minifs-3/build-imx233/linux/drivers/spi/spi-mxs.c:553:25: error: 'struct mxs_spi' has no member named 'csmux'
     gpio_request_one(spi->csmux[i], GPIOF_OUT_INIT_HIGH, name);
                         ^
/home/tkoskine/work/olinuxino/imx233-minifs/minifs-3/build-imx233/linux/drivers/spi/spi-mxs.c:554:23: error: 'struct mxs_spi' has no member named 'csmux'
     gpio_set_value(spi->csmux[i], 1);
                       ^
/home/tkoskine/work/olinuxino/imx233-minifs/minifs-3/build-imx233/linux/drivers/spi/spi-mxs.c:556:38: error: 'struct mxs_spi' has no member named 'csmuxcount'
    master->num_chipselect = (1 << spi->csmuxcount);
                                      ^
/home/tkoskine/work/olinuxino/imx233-minifs/minifs-3/build-imx233/linux/drivers/spi/spi-mxs.c: At top level:
/home/tkoskine/work/olinuxino/imx233-minifs/minifs-3/build-imx233/linux/drivers/spi/spi-mxs.c:79:12: warning: 'mxs_spi_setup_transfer' defined but not used [-Wunused-function]
 static int mxs_spi_setup_transfer(struct spi_device *dev,
            ^
/home/tkoskine/work/olinuxino/imx233-minifs/minifs-3/build-imx233/linux/drivers/spi/spi-mxs.c:177:12: warning: 'mxs_spi_txrx_dma' defined but not used [-Wunused-function]
 static int mxs_spi_txrx_dma(struct mxs_spi *spi,
            ^
/home/tkoskine/work/olinuxino/imx233-minifs/minifs-3/build-imx233/linux/drivers/spi/spi-mxs.c:313:12: warning: 'mxs_spi_txrx_pio' defined but not used [-Wunused-function]
 static int mxs_spi_txrx_pio(struct mxs_spi *spi,
            ^

The code in question is following:

struct mxs_spi {
        struct mxs_ssp          ssp;
        struct completion       c;
<<<<<<<
        unsigned int            sck;    /* Rate requested (vs actual) */
=======

        int             csmuxcount;     /* 0 for no special mux */
        int             csmux[8];
>>>>>>>
};

So, it looks like patching the source code failed.