Merge branch 'master' of /usr/src/ntfs-2.6/

1 files changed, 1 insertions, 6 deletions

diff --git a/fs/udf/balloc.c b/fs/udf/balloc.c
index b9ded26b10a9..4fae57d9d115 100644
--- a/fs/udf/balloc.c
+++ b/fs/udf/balloc.c
@@ -4,11 +4,6 @@
  * PURPOSE
  *      Block allocation handling routines for the OSTA-UDF(tm) filesystem.
  *
- * CONTACTS
- *      E-mail regarding any portion of the Linux UDF file system should be
- *      directed to the development team mailing list (run by majordomo):
- *              linux_udf@hpesjro.fc.hp.com
- *
  * COPYRIGHT
  *      This file is distributed under the terms of the GNU General Public
  *      License (GPL). Copies of the GPL can be obtained from:
@@ -46,7 +41,7 @@
 #define uint(x) xuint(x)
 #define xuint(x) __le ## x
 
-extern inline int find_next_one_bit (void * addr, int size, int offset)
+static inline int find_next_one_bit (void * addr, int size, int offset)
 {
         uintBPL_t * p = ((uintBPL_t *) addr) + (offset / BITS_PER_LONG);
         int result = offset & ~(BITS_PER_LONG-1);