diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-11-24 00:47:41 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-24 00:47:41 +0400 |
| commit | 58a273745fbb2fbd01d26e7a60f0acc8c1d99469 (patch) | |
| tree | bc16200f3b6ea150b298422754e32959eaa339bc /arch/arm/plat-samsung | |
| parent | 951c486f62490e032da0ad17e93270b0cfb6687f (diff) | |
| parent | 0116da4fcc1ae8a80d9002441e98768f2a6fa2fe (diff) | |
| download | linux-58a273745fbb2fbd01d26e7a60f0acc8c1d99469.tar.xz | |
Merge branches 'drivers/macb-gem' and 'drivers/pxa-gpio' into next/drivers
Diffstat (limited to 'arch/arm/plat-samsung')
| -rw-r--r-- | arch/arm/plat-samsung/dma-ops.c | 1 | ||||
| -rw-r--r-- | arch/arm/plat-samsung/s3c-dma-ops.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/dma-ops.c b/arch/arm/plat-samsung/dma-ops.c index 6e3d9abc9e2e..93a994a5dd8f 100644 --- a/arch/arm/plat-samsung/dma-ops.c +++ b/arch/arm/plat-samsung/dma-ops.c @@ -14,6 +14,7 @@ #include <linux/errno.h> #include <linux/amba/pl330.h> #include <linux/scatterlist.h> +#include <linux/export.h> #include <mach/dma.h> diff --git a/arch/arm/plat-samsung/s3c-dma-ops.c b/arch/arm/plat-samsung/s3c-dma-ops.c index 582333c70585..781494912827 100644 --- a/arch/arm/plat-samsung/s3c-dma-ops.c +++ b/arch/arm/plat-samsung/s3c-dma-ops.c @@ -14,6 +14,7 @@ #include <linux/errno.h> #include <linux/slab.h> #include <linux/types.h> +#include <linux/export.h> #include <mach/dma.h> |