diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-15 21:56:37 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-15 21:56:37 +0200 |
| commit | 62778396020a29d742abf980c1e83f3df4b5426e (patch) | |
| tree | 08dc01019a1afe6ed16ab79c627ecd81caea52e0 /drivers/misc/cb710/sgbuf2.c | |
| parent | ARM: i.MX53: Fix IOMUX type o's (diff) | |
| parent | ARM: mxs-dma: include <linux/dmaengine.h> (diff) | |
| download | linux-62778396020a29d742abf980c1e83f3df4b5426e.tar.xz linux-62778396020a29d742abf980c1e83f3df4b5426e.zip | |
Merge branch 'fixes-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/fixes
Diffstat (limited to 'drivers/misc/cb710/sgbuf2.c')
| -rw-r--r-- | drivers/misc/cb710/sgbuf2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/cb710/sgbuf2.c b/drivers/misc/cb710/sgbuf2.c index d019746551f3..2a40d0efdff5 100644 --- a/drivers/misc/cb710/sgbuf2.c +++ b/drivers/misc/cb710/sgbuf2.c @@ -47,7 +47,7 @@ static uint32_t sg_dwiter_read_buffer(struct sg_mapping_iter *miter) static inline bool needs_unaligned_copy(const void *ptr) { -#ifdef HAVE_EFFICIENT_UNALIGNED_ACCESS +#ifdef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS return false; #else return ((ptr - NULL) & 3) != 0; |