android_kernel_samsung_msm8976/include/asm-arm/arch-s3c2410
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
..
anubis-cpld.h [ARM] 2889/1: S3C2410 - Add machine Anubis 2005-09-07 11:49:23 +01:00
anubis-irq.h [ARM] 2889/1: S3C2410 - Add machine Anubis 2005-09-07 11:49:23 +01:00
anubis-map.h [ARM] 2934/1: Anubis - fix VA offsets for CPLD registers 2005-09-25 23:04:48 +01:00
audio.h [PATCH] ARM: 2762/1: S3C24XX Audio platform data 2005-06-28 21:01:03 +01:00
bast-cpld.h
bast-irq.h
bast-map.h
bast-pmu.h
debug-macro.S [ARM] 3266/1: S3C2400 - adds macro S3C24XX 2006-01-26 15:20:50 +00:00
dma.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
entry-macro.S [ARM] 3443/1: [S3C2410] Improve IRQ entry code 2006-04-02 00:09:26 +01:00
fb.h [ARM] 3045/2: S3C2410 - change init for lcd platform data 2005-10-28 15:31:45 +01:00
h1940-latch.h [ARM] 3326/1: H1940 - Control latches 2006-02-10 22:40:51 +00:00
hardware.h [ARM] 3284/1: S3C2400 - adds support to GPIO 2006-02-01 21:24:23 +00:00
idle.h
iic.h
io.h [ARM] 1/4: Move include of asm/hardware.h to asm-arm/arch-*/io.h 2005-10-28 10:20:25 +01:00
irqs.h
leds-gpio.h [PATCH] S3C24XX GPIO LED support 2006-04-11 06:18:40 -07:00
map.h [ARM] 3552/1: S3C24XX: Move VA of GPIO for low-level debug 2006-06-18 16:21:52 +01:00
memory.h [ARM] 3060/1: allow constants found in asm/memory.h to be used in asm code 2005-10-29 21:44:55 +01:00
nand.h
osiris-cpld.h [ARM] 3327/1: S3C2410 - add osiris machine support 2006-03-21 22:06:00 +00:00
osiris-map.h [ARM] 3327/1: S3C2410 - add osiris machine support 2006-03-21 22:06:00 +00:00
otom-map.h
regs-adc.h
regs-clock.h [ARM] 3559/1: S3C2442: core and serial port 2006-06-18 23:06:41 +01:00
regs-dsc.h
regs-gpio.h [ARM] 3559/1: S3C2442: core and serial port 2006-06-18 23:06:41 +01:00
regs-gpioj.h
regs-iic.h
regs-iis.h [ARM] 3077/1: S3C2410 - regs-iis.h missing mask for IISMOD_FS 2005-11-01 19:44:30 +00:00
regs-irq.h
regs-lcd.h [PATCH] s3c2410fb: ARM S3C2410 framebuffer driver 2005-09-09 14:03:42 -07:00
regs-mem.h [PATCH] ARM: 2640/1: Adds DRAM/BANKSIZE_MASK definitions for S3C2400 2005-04-25 18:36:50 +01:00
regs-nand.h [PATCH] ARM: 2676/1: S3C2440 - NAND register additions 2005-05-12 19:27:13 +01:00
regs-rtc.h
regs-sdi.h
regs-serial.h [ARM] 3266/1: S3C2400 - adds macro S3C24XX 2006-01-26 15:20:50 +00:00
regs-spi.h [PATCH] ARM: 2641/1: Adds S3C2400_SPPIN_nCS to arch-s3c2410/regs-spi.h 2005-04-25 18:40:31 +01:00
regs-timer.h
regs-udc.h
regs-watchdog.h
spi-gpio.h [PATCH] S3C24XX: GPIO based SPI driver 2006-05-21 12:59:19 -07:00
spi.h [PATCH] S3C24XX: hardware SPI driver 2006-05-21 12:59:19 -07:00
system.h
timex.h
uncompress.h Merge git://git.infradead.org/hdrcleanup-2.6 2006-06-20 15:10:08 -07:00
usb-control.h [PATCH] ARM: 2849/1: S3C24XX - USB host update (2848/1) 2005-08-10 16:45:14 +01:00
vmalloc.h [PATCH] ARM: cleanup vmalloc start/offset macros 2005-05-03 12:20:29 +01:00
vr1000-cpld.h
vr1000-irq.h
vr1000-map.h