Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/g…

…it/aegl/linux-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] move fnptr definition inside #ifdef __KERNEL__
ambv · Jan 8, 2010 · d86527d · d86527d
2 parents 0446e9d + a651d80
commit d86527d
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/arch/ia64/include/asm/types.h b/arch/ia64/include/asm/types.h
@@ -30,16 +30,16 @@
 
 typedef unsigned int umode_t;
 
-struct fnptr {
-	unsigned long ip;
-	unsigned long gp;
-};
-
 /*
  * These aren't exported outside the kernel to avoid name space clashes
  */
 # ifdef __KERNEL__
 
+struct fnptr {
+	unsigned long ip;
+	unsigned long gp;
+};
+
 /* DMA addresses are 64-bits wide, in general.  */
 typedef u64 dma_addr_t;