summaryrefslogtreecommitdiff
path: root/include/asm-arm
diff options
context:
space:
mode:
authorSimon Kagstrom <simon.kagstrom@netinsight.net>2009-08-24 09:09:50 +0200
committerWolfgang Denk <wd@denx.de>2009-09-15 22:31:24 +0200
commit02f99901ed1c9d828e3ea117f94ce2264bf8389e (patch)
tree1ce78481730fd40db796928a27f34bf5f885ef03 /include/asm-arm
parent557555fe0b82940ba7cc69f81d31d6ef4d4933b4 (diff)
downloadu-boot-imx-02f99901ed1c9d828e3ea117f94ce2264bf8389e.zip
u-boot-imx-02f99901ed1c9d828e3ea117f94ce2264bf8389e.tar.gz
u-boot-imx-02f99901ed1c9d828e3ea117f94ce2264bf8389e.tar.bz2
Move __set/clear_bit from ubifs.h to bitops.h
__set_bit and __clear_bit are defined in ubifs.h as well as in asm/include/bitops.h for some architectures. This patch moves the generic implementation to include/linux/bitops.h and uses that unless it's defined by the architecture. Signed-off-by: Simon Kagstrom <simon.kagstrom@netinsight.net>
Diffstat (limited to 'include/asm-arm')
-rw-r--r--include/asm-arm/bitops.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-arm/bitops.h b/include/asm-arm/bitops.h
index 4b8bab2..1549da1 100644
--- a/include/asm-arm/bitops.h
+++ b/include/asm-arm/bitops.h
@@ -29,6 +29,7 @@ static inline void __set_bit(int nr, volatile void *addr)
{
((unsigned char *) addr)[nr >> 3] |= (1U << (nr & 7));
}
+#define __set_bit
extern void clear_bit(int nr, volatile void * addr);
@@ -36,6 +37,7 @@ static inline void __clear_bit(int nr, volatile void *addr)
{
((unsigned char *) addr)[nr >> 3] &= ~(1U << (nr & 7));
}
+#define __clear_bit
extern void change_bit(int nr, volatile void * addr);