diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-06-16 12:08:13 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-06-16 12:08:13 -0400 |
| commit | f1bbbb6912662b9f6070c5bfc4ca9eb1f06a9d5b (patch) | |
| tree | c2c130a74be25b0b2dff992e1a195e2728bdaadd /arch/arm/include/asm/scatterlist.h | |
| parent | fd0961ff67727482bb20ca7e8ea97b83e9de2ddb (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
Merge branch 'master' into for-next
Diffstat (limited to 'arch/arm/include/asm/scatterlist.h')
| -rw-r--r-- | arch/arm/include/asm/scatterlist.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/include/asm/scatterlist.h b/arch/arm/include/asm/scatterlist.h index bcda59f39941..2f87870d9347 100644 --- a/arch/arm/include/asm/scatterlist.h +++ b/arch/arm/include/asm/scatterlist.h | |||
| @@ -3,9 +3,6 @@ | |||
| 3 | 3 | ||
| 4 | #include <asm/memory.h> | 4 | #include <asm/memory.h> |
| 5 | #include <asm/types.h> | 5 | #include <asm/types.h> |
| 6 | |||
| 7 | #include <asm-generic/scatterlist.h> | 6 | #include <asm-generic/scatterlist.h> |
| 8 | 7 | ||
| 9 | #undef ARCH_HAS_SG_CHAIN | ||
| 10 | |||
| 11 | #endif /* _ASMARM_SCATTERLIST_H */ | 8 | #endif /* _ASMARM_SCATTERLIST_H */ |