android_kernel_motorola_sm6225/include/asm-arm
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
..
arch-aaec2000 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2006-05-24 09:22:21 +01:00
arch-at91rm9200 Merge master.kernel.org:/home/rmk/linux-2.6-arm 2006-04-02 13:34:00 -07:00
arch-cl7500 Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
arch-clps711x Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
arch-ebsa110 [ARM] ebsa110: Fix incorrect serial port address 2006-04-07 13:23:48 +01:00
arch-ebsa285 Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
arch-ep93xx [ARM] 3451/1: ep93xx: use the m48t86 rtc driver on the ts72xx platform 2006-04-02 16:17:40 +01:00
arch-h720x [ARM] Fix decompressor serial IO to give CRLF not LFCR 2006-03-28 10:24:33 +01:00
arch-imx [ARM] 3501/1: i.MX: fix lowlevel debug macros 2006-05-07 18:56:27 +01:00
arch-integrator Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
arch-iop3xx Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
arch-ixp4xx Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2006-05-06 19:59:18 +01:00
arch-ixp23xx [ARM] 3539/1: ixp23xx: fix __arch_ixp23xx_is_coherent() for A1 stepping 2006-06-02 19:51:50 +01:00
arch-ixp2000 [ARM] Fix decompressor serial IO to give CRLF not LFCR 2006-03-28 10:24:33 +01:00
arch-l7200 [SERIAL] typo: buad -> baud 2006-06-05 10:45:30 +01:00
arch-lh7a40x Merge git://git.infradead.org/hdrcleanup-2.6 2006-06-20 15:10:08 -07:00
arch-omap Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
arch-pnx4008 [ARM] 3465/1: [1/3] Support for Philips PNX4008 platform: headers 2006-06-18 16:16:53 +01:00
arch-pxa Merge git://git.infradead.org/hdrcleanup-2.6 2006-06-20 15:10:08 -07:00
arch-realview Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
arch-rpc [ARM] Move FLUSH_BASE macros to asm/arch/memory.h 2006-04-07 13:22:21 +01:00
arch-s3c2410 Merge git://git.infradead.org/hdrcleanup-2.6 2006-06-20 15:10:08 -07:00
arch-sa1100 Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
arch-shark [ARM] Move FLUSH_BASE macros to asm/arch/memory.h 2006-04-07 13:22:21 +01:00
arch-versatile [ARM] Fix decompressor serial IO to give CRLF not LFCR 2006-03-28 10:24:33 +01:00
hardware Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
mach Merge git://git.infradead.org/hdrcleanup-2.6 2006-06-20 15:10:08 -07:00
a.out.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
apm.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
assembler.h [ARM] Move enable_irq and disable_irq to assembler.h 2006-03-23 16:59:37 +00:00
atomic.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
auxvec.h [PATCH] auxiliary vector cleanups 2005-09-07 16:57:21 -07:00
bitops.h [PATCH] bitops: arm: use generic bitops 2006-03-26 08:57:12 -08:00
bug.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2006-05-06 19:59:18 +01:00
bugs.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
byteorder.h [ARM] 3252/1: help gcc do the best with ___arch__swab32 2006-01-10 19:48:02 +00:00
cache.h [PATCH] Kill L1_CACHE_SHIFT_MAX 2006-01-08 20:13:39 -08:00
cacheflush.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
checksum.h [ARM] 3292/1: Fix memory corruption in asm-arm/checksum.h: ip_fast_csum() 2006-02-01 19:26:00 +00:00
cpu-multi32.h [PATCH] qualifiers in return types - easy cases 2005-08-23 18:43:45 -07:00
cpu-single.h [PATCH] qualifiers in return types - easy cases 2005-08-23 18:43:45 -07:00
cpu.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
cputime.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
current.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
delay.h [ARM] 3346/1: Fix udelay() for HZ values different from 100 2006-03-21 22:06:07 +00:00
div64.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
dma-mapping.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
dma.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
domain.h [ARM] 3377/2: add support for intel xsc3 core 2006-03-28 21:00:40 +01:00
ecard.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
elf.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
emergency-restart.h [PATCH] Add emergency_restart() 2005-07-26 14:35:41 -07:00
errno.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
fcntl.h [PATCH] Clean up struct flock64 definitions 2005-09-07 16:57:38 -07:00
fiq.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
floppy.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
fpstate.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
futex.h [PATCH] consolidate asm/futex.h 2006-01-08 20:13:39 -08:00
glue.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
hardirq.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
hardware.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
ide.h [PATCH] ARM: 2758/1: Fix comment in file header to read "ARM" instead i386 2005-06-27 15:58:39 +01:00
io.h [PATCH] remove ISA legacy functions: remove the helpers 2006-03-24 07:33:19 -08:00
ioctl.h [PATCH] Generic ioctl.h 2006-01-10 08:01:34 -08:00
ioctls.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
ipc.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
ipcbuf.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
irq.h [ARM] Fix cosmetic typo in asm/irq.h 2006-03-20 10:12:31 +00:00
kmap_types.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
leds.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
limits.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
linkage.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
local.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
locks.h [ARM] 3019/1: fix wrong comments 2005-10-18 07:51:34 +01:00
mc146818rtc.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
memory.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
mman.h [PATCH] add asm-generic/mman.h 2006-02-15 15:32:22 -08:00
mmu.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
mmu_context.h [ARM] Add linux/compiler.h includes where required 2005-11-16 17:23:57 +00:00
mmzone.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
module.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
msgbuf.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
mtd-xip.h [MTD] XIP cleanup 2005-07-07 16:50:16 +02:00
mutex.h [ARM] 3311/1: clean up include/asm-arm/mutex.h 2006-02-08 21:19:38 +00:00
namei.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
nwflash.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
page.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
param.h [ARM] Move HZ definition into Kconfig 2006-03-21 22:05:45 +00:00
parport.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
pci.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
percpu.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
pgalloc.h [ARM] nommu: Move hardware page table definitions to pgtable-hwdef.h 2006-03-21 22:03:25 +00:00
pgtable-hwdef.h [ARM] 3439/2: xsc3: add I/O coherency support 2006-04-02 00:07:39 +01:00
pgtable.h [ARM] 3439/2: xsc3: add I/O coherency support 2006-04-02 00:07:39 +01:00
poll.h [PATCH] POLLRDHUP/EPOLLRDHUP handling for half-closed devices notifications 2006-03-25 08:22:56 -08:00
posix_types.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
proc-fns.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
processor.h [ARM] start_thread fixup for nommu mode 2006-01-13 21:04:17 +00:00
procinfo.h [ARM] 3517/1: move definition of PROC_INFO_SZ from procinfo.h to asm-offsets.h 2006-05-16 11:39:30 +01:00
ptrace.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
resource.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
rtc.h [PATCH] RTC subsystem: ARM cleanup 2006-03-27 08:44:50 -08:00
scatterlist.h [ARM] Remove '__address' from scatterlist and convert to DMA API 2006-01-04 15:08:30 +00:00
sections.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
segment.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
semaphore-helper.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
semaphore.h [ARM] sema_count() removal 2005-12-01 20:58:01 +00:00
sembuf.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
serial.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
setup.h [ARM] 2925/3: earlyparam - postfix section with .init for make buildcheck 2005-09-20 16:25:12 +01:00
shmbuf.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
shmparam.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
sigcontext.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
siginfo.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
signal.h [ARM] Remove SA_IRQNOMASK 2005-09-26 15:30:20 +01:00
sizes.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
smp.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
socket.h [NET]: Introduce SO_{SND,RCV}BUFFORCE socket options 2005-08-29 15:31:35 -07:00
sockios.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
spinlock.h [ARM] 3533/1: Implement the __raw_(read|write)_can_lock functions on ARM 2006-05-19 21:55:35 +01:00
spinlock_types.h [PATCH] spinlock consolidation 2005-09-10 10:06:21 -07:00
stat.h [ARM] 3106/2: ARM EABI: some syscall adjustments 2006-01-14 16:32:12 +00:00
statfs.h [ARM] 3108/2: old ABI compat: statfs64 and fstatfs64 2006-01-14 16:35:03 +00:00
string.h [PATCH] ARM: 2653/1: Fix memset and memzero macro double-reference of parameters 2005-04-25 23:40:05 +01:00
suspend.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
system.h Merge git://git.infradead.org/hdrcleanup-2.6 2006-06-20 15:10:08 -07:00
termbits.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
termios.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
therm.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
thread_info.h [ARM] iwmmxt thread state alignment 2006-03-12 22:36:06 +00:00
timex.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
tlb.h [ARM] noMMU: removes TLB codes in nommu mode 2006-03-21 22:03:20 +00:00
tlbflush.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
topology.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
traps.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
types.h [PATCH] sab: consolidate kmem_bufctl_t 2005-09-05 00:05:48 -07:00
uaccess.h [ARM] Fix get_user when passed a const pointer 2005-11-18 14:22:03 +00:00
ucontext.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
unaligned.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
unistd.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2006-05-06 19:59:18 +01:00
user.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
vfp.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
vfpmacros.h [ARM] 3472/1: Use the D variants of FLDMIA/FSTMIA on ARMv6 2006-04-10 21:32:42 +01:00
vga.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
xor.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00