linux-next: build failure after merge of the staging.current tree

[Stephen Rothwell]

Hi Greg,

After merging the staging.current tree, today's linux-next build (powerpc
allyesconfig) failed like this:

drivers/staging/android/ion/ion_cma_heap.c: In function 'ion_cma_allocate':
drivers/staging/android/ion/ion_cma_heap.c:38:14: error: 'CONFIG_CMA_ALIGNMENT' undeclared (first use in this function)
  if (align > CONFIG_CMA_ALIGNMENT)
              ^

Caused by commit

  d98e6dbf42f7 ("staging: ion: Fix ion_cma_heap allocations")

CONFIG_CMA_ALIGNMENT (and CONFIG_DMA_CMA) is not set for this build.

I have reverted that commit for today.

-- 
Cheers,
Stephen Rothwell