5 files changed, 4 insertions, 5 deletions

diff --git a/include/asm-i386/floppy.h b/include/asm-i386/floppy.h
index f4782284807a..79727afb94c9 100644
--- a/include/asm-i386/floppy.h
+++ b/include/asm-i386/floppy.h
@@ -257,7 +257,7 @@ static int hard_dma_setup(char *addr, unsigned long size, int mode, int io)
         return 0;
 }
 
-struct fd_routine_l {
+static struct fd_routine_l {
         int (*_request_dma)(unsigned int dmanr, const char * device_id);
         void (*_free_dma)(unsigned int dmanr);
         int (*_get_dma_residue)(unsigned int dummy);
diff --git a/include/asm-parisc/floppy.h b/include/asm-parisc/floppy.h
index 47f53df2cef5..ca3aed768cdc 100644
--- a/include/asm-parisc/floppy.h
+++ b/include/asm-parisc/floppy.h
@@ -235,7 +235,7 @@ static int hard_dma_setup(char *addr, unsigned long size, int mode, int io)
         return 0;
 }
 
-struct fd_routine_l {
+static struct fd_routine_l {
         int (*_request_dma)(unsigned int dmanr, const char * device_id);
         void (*_free_dma)(unsigned int dmanr);
         int (*_get_dma_residue)(unsigned int dummy);
diff --git a/include/asm-sh/floppy.h b/include/asm-sh/floppy.h
index f030ca08052b..38d7a2942476 100644
--- a/include/asm-sh/floppy.h
+++ b/include/asm-sh/floppy.h
@@ -227,7 +227,7 @@ static int hard_dma_setup(char *addr, unsigned long size, int mode, int io)
         return 0;
 }
 
-struct fd_routine_l {
+static struct fd_routine_l {
         int (*_request_dma)(unsigned int dmanr, const char * device_id);
         void (*_free_dma)(unsigned int dmanr);
         int (*_get_dma_residue)(unsigned int dummy);
diff --git a/include/asm-x86_64/floppy.h b/include/asm-x86_64/floppy.h
index bca9b28a1a0a..af7ded63b517 100644
--- a/include/asm-x86_64/floppy.h
+++ b/include/asm-x86_64/floppy.h
@@ -223,7 +223,7 @@ static int hard_dma_setup(char *addr, unsigned long size, int mode, int io)
         return 0;
 }
 
-struct fd_routine_l {
+static struct fd_routine_l {
         int (*_request_dma)(unsigned int dmanr, const char * device_id);
         void (*_free_dma)(unsigned int dmanr);
         int (*_get_dma_residue)(unsigned int dummy);
diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
index 54f820832c73..7e736e201c46 100644
--- a/include/linux/binfmts.h
+++ b/include/linux/binfmts.h
@@ -77,7 +77,6 @@ extern int flush_old_exec(struct linux_binprm * bprm);
 extern int setup_arg_pages(struct linux_binprm * bprm,
                            unsigned long stack_top,
                            int executable_stack);
-extern int copy_strings(int argc,char __user * __user * argv,struct linux_binprm *bprm); 
 extern int copy_strings_kernel(int argc,char ** argv,struct linux_binprm *bprm);
 extern void compute_creds(struct linux_binprm *binprm);
 extern int do_coredump(long signr, int exit_code, struct pt_regs * regs);