Merge commit 'v2.6.37-rc1' into for-2.6.37

[~andy/linux] / arch / mn10300 / lib / bitops.c

diff --git a/arch/mn10300/lib/bitops.c b/arch/mn10300/lib/bitops.c
index 440a7dcbf87b52afb443451b5973d9ad16e48116..a66c6cdaf4424974de52cbc97583b294691e0d12 100644 (file)
--- a/arch/mn10300/lib/bitops.c
+++ b/arch/mn10300/lib/bitops.c
@@ -15,7 +15,7 @@
 /*
  * try flipping a bit using BSET and BCLR
  */
-void change_bit(int nr, volatile void *addr)
+void change_bit(unsigned long nr, volatile void *addr)
 {
        if (test_bit(nr, addr))
                goto try_clear_bit;
@@ -34,7 +34,7 @@ try_clear_bit:
 /*
  * try flipping a bit using BSET and BCLR and returning the old value
  */
-int test_and_change_bit(int nr, volatile void *addr)
+int test_and_change_bit(unsigned long nr, volatile void *addr)
 {
        if (test_bit(nr, addr))
                goto try_clear_bit;