diff options
author | Thierry Reding <treding@nvidia.com> | 2014-11-26 09:41:09 +0100 |
---|---|---|
committer | Thierry Reding <treding@nvidia.com> | 2014-11-26 09:42:11 +0100 |
commit | 7f06dd61248a75668bbb39b6fcca6ff407745df8 (patch) | |
tree | 30cefbd6f503d20557e24a1765a027687170a7da /arch/arc/include/asm/bitops.h | |
parent | Linux 3.18-rc1 (diff) | |
parent | powerpc/iommu: Rename iommu_[un]map_sg functions (diff) | |
download | linux-dev-7f06dd61248a75668bbb39b6fcca6ff407745df8.tar.xz linux-dev-7f06dd61248a75668bbb39b6fcca6ff407745df8.zip |
Merge branch 'core' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
This branch contains a couple of changes that will conflict with the
Tegra SMMU driver rewrite. Since the driver is largely rewritten the
conflict resolution is non-trivial.
Diffstat (limited to 'arch/arc/include/asm/bitops.h')
-rw-r--r-- | arch/arc/include/asm/bitops.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arc/include/asm/bitops.h b/arch/arc/include/asm/bitops.h index ebc0cf3164dc..1a5bf07eefe2 100644 --- a/arch/arc/include/asm/bitops.h +++ b/arch/arc/include/asm/bitops.h @@ -13,8 +13,6 @@ #error only <linux/bitops.h> can be included directly #endif -#ifdef __KERNEL__ - #ifndef __ASSEMBLY__ #include <linux/types.h> @@ -508,6 +506,4 @@ static inline __attribute__ ((const)) int __ffs(unsigned long word) #endif /* !__ASSEMBLY__ */ -#endif /* __KERNEL__ */ - #endif |