aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-01-08 13:57:19 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-01-08 13:57:19 -0800
commitd86527ddcab4684d1a051b5f35f023b4374b1271 (patch)
tree681cc85e16defea8f3c4f8d011f08f79898138a8
parent0446e9d46347344dd2d794927f22eb81e1d1c296 (diff)
parenta651d80c7136029de3c044308fd63d88348915ff (diff)
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/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__
-rw-r--r--arch/ia64/include/asm/types.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/ia64/include/asm/types.h b/arch/ia64/include/asm/types.h
index b8e5d97be15..93773fd37be 100644
--- 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;