Merge tag 'parisc-for-linus' of git://git.kernel.org/pub/scm/linux/ke…

…rnel/git/jejb/parisc-2.6 Pull PARISC changes from James Bottomley: "This is a couple of high code motion patches (all within arch/parisc) I'd like to apply at -rc1 to avoid conflicts with anything else. One moves us on to the generated instead of included asm file model and the other is a pull request from David Howells for UAPI disintegration. Signed-off-by: James Bottomley <JBottomley@Parallels.com>" * tag 'parisc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6: UAPI: (Scripted) Disintegrate arch/parisc/include/asm [PARISC] asm: redo generic includes
git-mirror · Oct 19, 2012 · 22054fb · 22054fb
2 parents ea26d0c + 6238559
commit 22054fb
Show file tree

Hide file tree

Showing 57 changed files with 1,511 additions and 1,542 deletions.
diff --git a/arch/parisc/include/asm/Kbuild b/arch/parisc/include/asm/Kbuild
@@ -1,6 +1,5 @@
-include include/asm-generic/Kbuild.asm
 
-header-y += pdc.h
-generic-y += clkdev.h
-generic-y += word-at-a-time.h
-generic-y += exec.h
+generic-y += word-at-a-time.h auxvec.h user.h cputime.h emergency-restart.h \
+	  segment.h topology.h vga.h device.h percpu.h hw_irq.h mutex.h \
+	  div64.h irq_regs.h kdebug.h kvm_para.h local64.h local.h param.h \
+	  poll.h xor.h clkdev.h exec.h
diff --git a/arch/parisc/include/asm/auxvec.h b/arch/parisc/include/asm/auxvec.h
diff --git a/arch/parisc/include/asm/compat_signal.h b/arch/parisc/include/asm/compat_signal.h
diff --git a/arch/parisc/include/asm/cputime.h b/arch/parisc/include/asm/cputime.h
diff --git a/arch/parisc/include/asm/device.h b/arch/parisc/include/asm/device.h
diff --git a/arch/parisc/include/asm/div64.h b/arch/parisc/include/asm/div64.h
diff --git a/arch/parisc/include/asm/emergency-restart.h b/arch/parisc/include/asm/emergency-restart.h
diff --git a/arch/parisc/include/asm/hw_irq.h b/arch/parisc/include/asm/hw_irq.h
diff --git a/arch/parisc/include/asm/irq_regs.h b/arch/parisc/include/asm/irq_regs.h
diff --git a/arch/parisc/include/asm/kdebug.h b/arch/parisc/include/asm/kdebug.h
diff --git a/arch/parisc/include/asm/kvm_para.h b/arch/parisc/include/asm/kvm_para.h
diff --git a/arch/parisc/include/asm/local.h b/arch/parisc/include/asm/local.h
diff --git a/arch/parisc/include/asm/local64.h b/arch/parisc/include/asm/local64.h
diff --git a/arch/parisc/include/asm/mutex.h b/arch/parisc/include/asm/mutex.h
diff --git a/arch/parisc/include/asm/param.h b/arch/parisc/include/asm/param.h