diff --git a/[refs] b/[refs] index af49c216a3ae..e295441a49ac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d26dbc5cf94b0a28acc947285c3b54814a73cb2e +refs/heads/master: ed6dc4981368aa8ac89b0ea61535cfa2b03533cb diff --git a/trunk/include/asm-x86/bitops.h b/trunk/include/asm-x86/bitops.h index cfb2b64f76e7..28ea8742b6e1 100644 --- a/trunk/include/asm-x86/bitops.h +++ b/trunk/include/asm-x86/bitops.h @@ -424,16 +424,6 @@ static inline int fls(int x) #undef ADDR -static inline void set_bit_string(unsigned long *bitmap, - unsigned long i, int len) -{ - unsigned long end = i + len; - while (i < end) { - __set_bit(i, bitmap); - i++; - } -} - #ifdef __KERNEL__ #include