diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-20 22:10:08 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-20 22:10:08 (GMT) |
commit | cee4cca740d209bcb4b9857baa2253d5ba4e3fbe (patch) | |
tree | 88a23004393ea4a32cad79839479c8e653e401d6 /include/asm-v850 | |
parent | 2edc322d420a4cec8dbc184a1220ecd7fa9f8ae6 (diff) | |
parent | 9348f0de2d2b541b4ba64fb1f4efee9710a3d731 (diff) | |
download | linux-fsl-qoriq-cee4cca740d209bcb4b9857baa2253d5ba4e3fbe.tar.xz |
Merge git://git.infradead.org/hdrcleanup-2.6
* git://git.infradead.org/hdrcleanup-2.6: (63 commits)
[S390] __FD_foo definitions.
Switch to __s32 types in joystick.h instead of C99 types for consistency.
Add <sys/types.h> to headers included for userspace in <linux/input.h>
Move inclusion of <linux/compat.h> out of user scope in asm-x86_64/mtrr.h
Remove struct fddi_statistics from user view in <linux/if_fddi.h>
Move user-visible parts of drivers/s390/crypto/z90crypt.h to include/asm-s390
Revert include/media changes: Mauro says those ioctls are only used in-kernel(!)
Include <linux/types.h> and use __uXX types in <linux/cramfs_fs.h>
Use __uXX types in <linux/i2o_dev.h>, include <linux/ioctl.h> too
Remove private struct dx_hash_info from public view in <linux/ext3_fs.h>
Include <linux/types.h> and use __uXX types in <linux/affs_hardblocks.h>
Use __uXX types in <linux/divert.h> for struct divert_blk et al.
Use __u32 for elf_addr_t in <asm-powerpc/elf.h>, not u32. It's user-visible.
Remove PPP_FCS from user view in <linux/ppp_defs.h>, remove __P mess entirely
Use __uXX types in user-visible structures in <linux/nbd.h>
Don't use 'u32' in user-visible struct ip_conntrack_old_tuple.
Use __uXX types for S390 DASD volume label definitions which are user-visible
S390 BIODASDREADCMB ioctl should use __u64 not u64 type.
Remove unneeded inclusion of <linux/time.h> from <linux/ufs_fs.h>
Fix private integer types used in V4L2 ioctls.
...
Manually resolve conflict in include/linux/mtd/physmap.h
Diffstat (limited to 'include/asm-v850')
-rw-r--r-- | include/asm-v850/atomic.h | 1 | ||||
-rw-r--r-- | include/asm-v850/bitops.h | 1 | ||||
-rw-r--r-- | include/asm-v850/dma-mapping.h | 1 | ||||
-rw-r--r-- | include/asm-v850/hardirq.h | 1 | ||||
-rw-r--r-- | include/asm-v850/machdep.h | 1 | ||||
-rw-r--r-- | include/asm-v850/pgtable.h | 1 | ||||
-rw-r--r-- | include/asm-v850/processor.h | 1 | ||||
-rw-r--r-- | include/asm-v850/serial.h | 1 | ||||
-rw-r--r-- | include/asm-v850/unistd.h | 12 | ||||
-rw-r--r-- | include/asm-v850/v850e_uart.h | 1 |
10 files changed, 4 insertions, 17 deletions
diff --git a/include/asm-v850/atomic.h b/include/asm-v850/atomic.h index 166df00..e4e57de 100644 --- a/include/asm-v850/atomic.h +++ b/include/asm-v850/atomic.h @@ -14,7 +14,6 @@ #ifndef __V850_ATOMIC_H__ #define __V850_ATOMIC_H__ -#include <linux/config.h> #include <asm/system.h> diff --git a/include/asm-v850/bitops.h b/include/asm-v850/bitops.h index 1f6fd5a..1fa99ba 100644 --- a/include/asm-v850/bitops.h +++ b/include/asm-v850/bitops.h @@ -14,7 +14,6 @@ #define __V850_BITOPS_H__ -#include <linux/config.h> #include <linux/compiler.h> /* unlikely */ #include <asm/byteorder.h> /* swab32 */ #include <asm/system.h> /* interrupt enable/disable */ diff --git a/include/asm-v850/dma-mapping.h b/include/asm-v850/dma-mapping.h index c63fb50..1cc42c6 100644 --- a/include/asm-v850/dma-mapping.h +++ b/include/asm-v850/dma-mapping.h @@ -1,7 +1,6 @@ #ifndef __V850_DMA_MAPPING_H__ #define __V850_DMA_MAPPING_H__ -#include <linux/config.h> #ifdef CONFIG_PCI #include <asm-generic/dma-mapping.h> diff --git a/include/asm-v850/hardirq.h b/include/asm-v850/hardirq.h index d98488c..04e2012 100644 --- a/include/asm-v850/hardirq.h +++ b/include/asm-v850/hardirq.h @@ -1,7 +1,6 @@ #ifndef __V850_HARDIRQ_H__ #define __V850_HARDIRQ_H__ -#include <linux/config.h> #include <linux/threads.h> #include <linux/cache.h> diff --git a/include/asm-v850/machdep.h b/include/asm-v850/machdep.h index 98d8bf6..f1e3b8b 100644 --- a/include/asm-v850/machdep.h +++ b/include/asm-v850/machdep.h @@ -14,7 +14,6 @@ #ifndef __V850_MACHDEP_H__ #define __V850_MACHDEP_H__ -#include <linux/config.h> /* chips */ #ifdef CONFIG_V850E_MA1 diff --git a/include/asm-v850/pgtable.h b/include/asm-v850/pgtable.h index 3cf8775..1ea2a90 100644 --- a/include/asm-v850/pgtable.h +++ b/include/asm-v850/pgtable.h @@ -3,7 +3,6 @@ #include <asm-generic/4level-fixup.h> -#include <linux/config.h> #include <asm/page.h> diff --git a/include/asm-v850/processor.h b/include/asm-v850/processor.h index 2d31308..6965b66 100644 --- a/include/asm-v850/processor.h +++ b/include/asm-v850/processor.h @@ -14,7 +14,6 @@ #ifndef __V850_PROCESSOR_H__ #define __V850_PROCESSOR_H__ -#include <linux/config.h> #ifndef __ASSEMBLY__ /* <linux/thread_info.h> is not asm-safe. */ #include <linux/thread_info.h> #endif diff --git a/include/asm-v850/serial.h b/include/asm-v850/serial.h index 8c2a609..36d8f4c 100644 --- a/include/asm-v850/serial.h +++ b/include/asm-v850/serial.h @@ -6,7 +6,6 @@ * Copyright (C) 1999 by Ralf Baechle * Copyright (C) 1999, 2000 Silicon Graphics, Inc. */ -#include <linux/config.h> #ifdef CONFIG_RTE_CB_ME2 diff --git a/include/asm-v850/unistd.h b/include/asm-v850/unistd.h index 82460a7..bcb44bf 100644 --- a/include/asm-v850/unistd.h +++ b/include/asm-v850/unistd.h @@ -14,8 +14,6 @@ #ifndef __V850_UNISTD_H__ #define __V850_UNISTD_H__ -#include <asm/clinkage.h> - #define __NR_restart_syscall 0 #define __NR_exit 1 #define __NR_fork 2 @@ -237,10 +235,9 @@ except the syscall number (r12). */ #define SYSCALL_SHORT_CLOBBERS SYSCALL_CLOBBERS, "r13", "r14" +#ifdef __KERNEL__ -/* User programs sometimes end up including this header file - (indirectly, via uClibc header files), so I'm a bit nervous just - including <linux/compiler.h>. */ +#include <asm/clinkage.h> #define __syscall_return(type, res) \ do { \ @@ -368,7 +365,6 @@ type name (atype a, btype b, ctype c, dtype d, etype e, ftype f) \ } -#ifdef __KERNEL__ #define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_OLD_READDIR #define __ARCH_WANT_STAT64 @@ -389,7 +385,6 @@ type name (atype a, btype b, ctype c, dtype d, etype e, ftype f) \ #define __ARCH_WANT_SYS_SIGPENDING #define __ARCH_WANT_SYS_SIGPROCMASK #define __ARCH_WANT_SYS_RT_SIGACTION -#endif #ifdef __KERNEL_SYSCALLS__ @@ -440,7 +435,7 @@ asmlinkage long sys_rt_sigaction(int sig, struct sigaction __user *oact, size_t sigsetsize); -#endif +#endif /* __KERNEL_SYSCALLS__ */ /* * "Conditional" syscalls @@ -455,4 +450,5 @@ asmlinkage long sys_rt_sigaction(int sig, void name (void) __attribute__ ((weak, alias ("sys_ni_syscall"))); #endif +#endif /* __KERNEL__ */ #endif /* __V850_UNISTD_H__ */ diff --git a/include/asm-v850/v850e_uart.h b/include/asm-v850/v850e_uart.h index 5930d59..5182fb4 100644 --- a/include/asm-v850/v850e_uart.h +++ b/include/asm-v850/v850e_uart.h @@ -19,7 +19,6 @@ #ifndef __V850_V850E_UART_H__ #define __V850_V850E_UART_H__ -#include <linux/config.h> #include <linux/termios.h> #include <asm/v850e_utils.h> |