linux/include/asm-mips/mach-generic
Linus Torvalds cee4cca740 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
2006-06-20 15:10:08 -07:00
..
cpu-feature-overrides.h Typo fix. 2005-10-29 19:32:14 +01:00
floppy.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
ide.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
ioremap.h Inline ioremap() calls for constant addresses that map to KSEG1. 2005-10-29 19:31:34 +01:00
irq.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
kernel-entry-init.h Move Origin crapola into a machine-specific header file. 2005-10-29 19:31:52 +01:00
kmalloc.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
mangle-port.h [MIPS] Make I/O helpers more customizable 2006-03-21 13:27:45 +00:00
mc146818rtc.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
spaces.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
timex.h [MIPS] RM200: Give RM200 it's own timex.h. 2006-02-14 19:13:23 +00:00
topology.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00