diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-21 02:10:08 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-21 02:10:08 +0400 |
| commit | cee4cca740d209bcb4b9857baa2253d5ba4e3fbe (patch) | |
| tree | 88a23004393ea4a32cad79839479c8e653e401d6 /include/asm-alpha/smp.h | |
| parent | 2edc322d420a4cec8dbc184a1220ecd7fa9f8ae6 (diff) | |
| parent | 9348f0de2d2b541b4ba64fb1f4efee9710a3d731 (diff) | |
| download | linux-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-alpha/smp.h')
| -rw-r--r-- | include/asm-alpha/smp.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-alpha/smp.h b/include/asm-alpha/smp.h index e1432102be05..a1a1eca6be45 100644 --- a/include/asm-alpha/smp.h +++ b/include/asm-alpha/smp.h @@ -1,7 +1,6 @@ #ifndef __ASM_SMP_H #define __ASM_SMP_H -#include <linux/config.h> #include <linux/threads.h> #include <linux/cpumask.h> #include <linux/bitops.h> |