linux-next: build failure after merge of the spi tree

Hi Mark,

After merging the spi tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/spi/spi-bcm2835.c: In function 'bcm2835_spi_can_dma':
drivers/spi/spi-bcm2835.c:381:7: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
  if (((u32)tfr->tx_buf % 4 == 0) && ((u32)tfr->tx_buf % 4 == 0))
       ^
drivers/spi/spi-bcm2835.c:381:38: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
  if (((u32)tfr->tx_buf % 4 == 0) && ((u32)tfr->tx_buf % 4 == 0))
                                      ^
drivers/spi/spi-bcm2835.c:387:7: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
  if (((u32)tfr->tx_buf % SZ_4K) + tfr->len > SZ_4K) {
       ^
drivers/spi/spi-bcm2835.c:387:26: error: 'SZ_4K' undeclared (first use in this function)
  if (((u32)tfr->tx_buf % SZ_4K) + tfr->len > SZ_4K) {
                          ^
drivers/spi/spi-bcm2835.c:387:26: note: each undeclared identifier is reported only once for each function it appears in
drivers/spi/spi-bcm2835.c:392:7: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
  if (((u32)tfr->rx_buf % SZ_4K) + tfr->len > SZ_4K) {
       ^

Caused by commit 3ecd37edaa2a ("spi: bcm2835: enable dma modes for
transfers meeting certain conditions").

I have used the spi tree from next-20150511 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au