diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-07-04 17:27:06 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-07-04 17:27:06 +0200 |
commit | efa4d684d8927428d333f841e37adeedcfe61cfb (patch) | |
tree | 5c780a94fdfa9557da018a485d7fe884244aaf48 /arch/sandbox | |
parent | 45d593bc5ec78e26e3a967517ed7a51f27c8b91f (diff) | |
parent | 10d63913999fbd5c02a2a8daecf877c24663bdca (diff) | |
download | barebox-efa4d684d8927428d333f841e37adeedcfe61cfb.tar.gz barebox-efa4d684d8927428d333f841e37adeedcfe61cfb.tar.xz |
Merge branch 'for-next/misc'
Conflicts:
arch/arm/boards/chumby_falconwing/falconwing.c
arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c
arch/x86/mach-x86.dox
scripts/setupmbr/setupmbr.c
Diffstat (limited to 'arch/sandbox')
-rw-r--r-- | arch/sandbox/include/asm/bitops.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/sandbox/include/asm/bitops.h b/arch/sandbox/include/asm/bitops.h index 94646d4d0d..447023da63 100644 --- a/arch/sandbox/include/asm/bitops.h +++ b/arch/sandbox/include/asm/bitops.h @@ -12,4 +12,11 @@ #include <asm-generic/bitops/hweight.h> #include <asm-generic/bitops/ops.h> +#define set_bit(x, y) __set_bit(x, y) +#define clear_bit(x, y) __clear_bit(x, y) +#define change_bit(x, y) __change_bit(x, y) +#define test_and_set_bit(x, y) __test_and_set_bit(x, y) +#define test_and_clear_bit(x, y) __test_and_clear_bit(x, y) +#define test_and_change_bit(x, y) __test_and_change_bit(x, y) + #endif |