diff options
| author | guoyin.chen <guoyin.chen@freescale.com> | 2013-07-15 15:01:21 +0800 |
|---|---|---|
| committer | guoyin.chen <guoyin.chen@freescale.com> | 2013-07-15 15:01:21 +0800 |
| commit | 5793da66dd82a437c23d4a833674c0e09bd1aa07 (patch) | |
| tree | 2f34bdc95dedb46d2a91d12837e58b1cf3a3e33f /mm | |
| parent | f128c5660150679f00e518da8e3f582e9a2f03a8 (diff) | |
| parent | 9e268cc3e4386f1a5a31a62f7207e5a9b8420124 (diff) | |
Merge remote-tracking branch 'fsl-linux-sdk/imx_3.0.35_4.1.0' into imx_3.0.35_android
Conflicts:
arch/arm/mach-mx6/Kconfig
arch/arm/mach-mx6/board-mx6q_arm2.c
arch/arm/mach-mx6/board-mx6q_arm2.h
arch/arm/mach-mx6/board-mx6q_hdmidongle.c
arch/arm/mach-mx6/board-mx6q_sabreauto.c
arch/arm/mach-mx6/board-mx6q_sabreauto.h
arch/arm/mach-mx6/board-mx6q_sabrelite.c
arch/arm/mach-mx6/board-mx6q_sabresd.c
arch/arm/mach-mx6/board-mx6q_sabresd.h
arch/arm/mach-mx6/clock.c
arch/arm/mach-mx6/pcie.c
arch/arm/plat-mxc/include/mach/iomux-mx6q.h
arch/arm/plat-mxc/include/mach/pcie.h
drivers/dma/imx-sdma.c
drivers/input/touchscreen/egalax_ts.c
drivers/media/video/mxc/capture/csi_v4l2_capture.c
drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c
drivers/mxc/mlb/mxc_mlb150.c
drivers/mxc/thermal/thermal.c
drivers/net/fec.c
drivers/usb/host/ehci-arc.c
drivers/video/mxc/mxc_ipuv3_fb.c
include/linux/fec.h
sound/soc/imx/imx-wm8962.c
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/dmapool.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/mm/dmapool.c b/mm/dmapool.c index 98798f414cb9..0d19926ce740 100644 --- a/mm/dmapool.c +++ b/mm/dmapool.c @@ -212,7 +212,6 @@ static void pool_initialise_page(struct dma_pool *pool, struct dma_page *page) } while (offset < pool->allocation); } -#ifdef CONFIG_FSL_UTP static struct dma_page *pool_alloc_page_nonbufferable(struct dma_pool *pool, gfp_t mem_flags) { struct dma_page *page; @@ -236,7 +235,6 @@ static struct dma_page *pool_alloc_page_nonbufferable(struct dma_pool *pool, gfp } return page; } -#endif static struct dma_page *pool_alloc_page(struct dma_pool *pool, gfp_t mem_flags) { @@ -379,7 +377,6 @@ void *dma_pool_alloc(struct dma_pool *pool, gfp_t mem_flags, } EXPORT_SYMBOL(dma_pool_alloc); -#ifdef CONFIG_FSL_UTP /** * dma_pool_alloc_nonbufferable - get a block of consistent memory * @pool: dma pool that will produce the block @@ -439,7 +436,6 @@ void *dma_pool_alloc_nonbufferable(struct dma_pool *pool, gfp_t mem_flags, return retval; } EXPORT_SYMBOL(dma_pool_alloc_nonbufferable); -#endif static struct dma_page *pool_find_page(struct dma_pool *pool, dma_addr_t dma) { |