summaryrefslogtreecommitdiffstats
path: root/arch/m68knommu/include/asm/bootinfo.h
diff options
context:
space:
mode:
authorLinus Torvalds2008-08-08 03:07:33 +0200
committerLinus Torvalds2008-08-08 03:07:33 +0200
commit3d8cd0c5d75c424f986c0602dc26579fbb7c8080 (patch)
tree03c61f81542f6c34e32eb5e0dfc3d34668f88fdd /arch/m68knommu/include/asm/bootinfo.h
parentpowerpc/iseries: remove the old viocons driver (diff)
parentMove all of include/asm-m68knommu to arch/m68knommu/include/asm. (diff)
downloadkernel-qcow2-linux-3d8cd0c5d75c424f986c0602dc26579fbb7c8080.tar.gz
kernel-qcow2-linux-3d8cd0c5d75c424f986c0602dc26579fbb7c8080.tar.xz
kernel-qcow2-linux-3d8cd0c5d75c424f986c0602dc26579fbb7c8080.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: Move all of include/asm-m68knommu to arch/m68knommu/include/asm.
Diffstat (limited to 'arch/m68knommu/include/asm/bootinfo.h')
-rw-r--r--arch/m68knommu/include/asm/bootinfo.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/m68knommu/include/asm/bootinfo.h b/arch/m68knommu/include/asm/bootinfo.h
new file mode 100644
index 000000000000..c12e526f5189
--- /dev/null
+++ b/arch/m68knommu/include/asm/bootinfo.h
@@ -0,0 +1,2 @@
+
+/* Nothing for m68knommu */