Paul Mundt 9a19eb2a66 sh: Fix up some merge damage. ...

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

2008-10-20 11:37:58 +09:00

..

hd64465

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

.gitignore

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

adc.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

addrspace.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

atomic-grb.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

atomic-irq.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

atomic-llsc.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

atomic.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

auxvec.h

sh: Make sure AT_SYSINFO_EHDR is exposed to userspace in asm/auxvec.h.

2008-07-29 23:12:25 +09:00

bitops-grb.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

bitops-irq.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

bitops-llsc.h

sh: Provide movli.l/movco.l-based bitops.

2008-09-08 10:35:02 +09:00

bitops.h

sh: Provide movli.l/movco.l-based bitops.

2008-09-08 10:35:02 +09:00

bug.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

bugs.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

byteorder.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

cache.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

cacheflush.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

checksum_32.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

checksum_64.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

checksum.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

clock.h

sh: fixup many sparse errors.

2008-09-08 10:35:04 +09:00

cmpxchg-grb.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

cmpxchg-irq.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

cmpxchg-llsc.h

sh: Provide movli.l/movco.l-based cmpxchg.

2008-09-08 10:35:02 +09:00

cpu-features.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

cputime.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

current.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

delay.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

device.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

div64.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

dma-mapping.h

Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

2008-08-01 10:53:43 -07:00

dma.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

dmabrg.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

edosk7705.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

elf.h

sh: Fix up some merge damage.

2008-10-20 11:37:58 +09:00

emergency-restart.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

entry-macros.S

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

errno.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

fb.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

fcntl.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

fixmap.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

flat.h

sh: Provide a FLAT_PLAT_INIT() definition.

2008-08-11 20:17:55 +09:00

fpu.h

sh: Add FPU registers to regset interface.

2008-09-21 19:04:55 +09:00

freq.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

ftrace.h

sh: Add missing asm/ftrace.h.

2008-09-21 17:17:53 +09:00

futex-irq.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

futex.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

gpio.h

sh: GPIO and pinmux base code

2008-10-20 10:33:50 +09:00

hardirq.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

hd64461.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

heartbeat.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

hp6xx.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

hugetlb.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

hw_irq.h

sh: Move the shared INTC code out to drivers/sh/

2008-10-01 16:13:54 +09:00

i2c-sh7760.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

ilsel.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

io_generic.h

sh: More I/O routine overhauling.

2008-10-04 05:25:52 +09:00

io_trapped.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

io.h

sh: More I/O routine overhauling.

2008-10-04 05:25:52 +09:00

ioctl.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

ioctls.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

ipcbuf.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

irq_regs.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

irq.h

sh: fixup many sparse errors.

2008-09-08 10:35:04 +09:00

irqflags_32.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

irqflags_64.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

irqflags.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

Kbuild

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

kdebug.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

kexec.h

kexec jump: rename KEXEC_CONTROL_CODE_SIZE to KEXEC_CONTROL_PAGE_SIZE

2008-08-15 08:35:42 -07:00

kgdb.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

kmap_types.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

kprobes.h

sh: kprobes: Use trapa #0x3a for breakpoint trap.

2008-09-08 18:10:10 +09:00

lboxre2.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

linkage.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

local.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

machvec.h

sh: More I/O routine overhauling.

2008-10-04 05:25:52 +09:00

magicpanelr2.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

mc146818rtc.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

microdev.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

migor.h

video: sh_mobile_lcdcfb: Support HAVE_CLK=n configurations.

2008-10-01 16:24:32 +09:00

mman.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

mmu_context_32.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

mmu_context_64.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

mmu_context.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

mmu.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

mmzone.h

sh: Fix up NUMA build error with se7722_defconfig.

2008-09-12 22:41:30 +09:00

module.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

msgbuf.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

mutex.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

page.h

sh: ioremap_prot support.

2008-09-12 20:41:05 +09:00

param.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

parport.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

pci.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

percpu.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

pgalloc.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

pgtable_32.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

pgtable_64.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

pgtable.h

sh: ioremap_prot support.

2008-09-12 20:41:05 +09:00

pm.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

poll.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

posix_types_32.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

posix_types_64.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

posix_types.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

processor_32.h

sh: Consolidate struct sh_cpuinfo definitions across _32/_64 split.

2008-09-17 23:24:02 +09:00

processor_64.h

sh: Consolidate struct sh_cpuinfo definitions across _32/_64 split.

2008-09-17 23:24:02 +09:00

processor.h

sh: Consolidate struct sh_cpuinfo definitions across _32/_64 split.

2008-09-17 23:24:02 +09:00

ptrace.h

sh: Add DSP registers to regset interface.

2008-09-12 22:42:10 +09:00

push-switch.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

r7780rp.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

resource.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

rtc.h

sh: fixup many sparse errors.

2008-09-08 10:35:04 +09:00

rts7751r2d.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

rwsem.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

scatterlist.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

sdk7780.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

seccomp.h

sh: seccomp support.

2008-08-02 04:39:32 +09:00

sections.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

segment.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

sembuf.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

serial.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

setup.h

sh: Fix up headers_check regression.

2008-09-17 23:24:59 +09:00

sfp-machine.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

sh7203.h

sh: Add sh7203 pinmux code

2008-10-20 10:34:18 +09:00

sh7720.h

sh: Add sh7720 pinmux code

2008-10-20 10:34:25 +09:00

sh7722.h

sh: Add sh7722 pinmux code

2008-10-20 10:34:05 +09:00

sh7723.h

sh: Add sh7723 pinmux code

2008-10-20 10:34:12 +09:00

sh7760fb.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

sh7763rdp.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

sh7785lcr.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

sh_bios.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

sh_eth.h

[netdrvr] sh_eth: Add SH7619 support

2008-08-07 02:20:57 -04:00

sh_keysc.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

shmbuf.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

shmin.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

shmparam.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

sigcontext.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

siginfo.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

signal.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

sizes.h

sh: Add a few more definitions to asm/sizes.h.

2008-09-21 10:31:57 +09:00

smc37c93x.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

smp.h

sh: generic clockevent broadcast support.

2008-09-08 10:35:03 +09:00

snapgear.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

socket.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

sockios.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

sparsemem.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

spi.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

spinlock_types.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

spinlock.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

stat.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

statfs.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

string_32.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

string_64.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

string.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

syscall_32.h

sh: Provide the asm/syscall.h interface, needed by tracehook.

2008-09-12 22:13:13 +09:00

syscall_64.h

sh: Provide the asm/syscall.h interface, needed by tracehook.

2008-09-12 22:13:13 +09:00

syscall.h

sh: Provide the asm/syscall.h interface, needed by tracehook.

2008-09-12 22:13:13 +09:00

syscalls_32.h

sh: fixup many sparse errors.

2008-09-08 10:35:04 +09:00

syscalls_64.h

sh: fixup many sparse errors.

2008-09-08 10:35:04 +09:00

syscalls.h

sh: fixup many sparse errors.

2008-09-08 10:35:04 +09:00

system_32.h

sh: Move lookup_exception_vector() out to asm/system_32.h.

2008-09-21 12:00:23 +09:00

system_64.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

system.h

sh: fixup many sparse errors.

2008-09-08 10:35:04 +09:00

systemh7751.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

termbits.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

termios.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

thread_info.h

sh: Support kernel stacks smaller than a page.

2008-09-20 20:21:33 +09:00

timer.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

timex.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

titan.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

tlb_64.h

sh: Fix up broken kerneldoc comments.

2008-08-04 12:51:06 +09:00

tlb.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

tlbflush.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

topology.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

types.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

uaccess_32.h

sh: Proper __put_user_asm() size mismatch fix.

2008-07-29 09:16:33 +09:00

uaccess_64.h

sh: sh_ksyms_64 needs __strncpy_from_user() definition.

2008-09-29 19:45:16 +09:00

uaccess.h

sh: Proper __put_user_asm() size mismatch fix.

2008-07-29 09:16:33 +09:00

ubc.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

ucontext.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

unaligned.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

unistd_32.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

unistd_64.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

unistd.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

user.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

vga.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

watchdog.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00

xor.h

sh: migrate to arch/sh/include/

2008-07-29 08:09:44 +09:00