summaryrefslogtreecommitdiff
path: root/arch/s390/include/asm/device.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-08-05 04:15:07 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-08-05 04:15:07 +0400
commit5941de8eadc287f3f47b87ce9888734ee07d210b (patch)
tree2f5a8e84c33ae2df61e4e807798a153d6b7f6fbb /arch/s390/include/asm/device.h
parentc44df7413fd711bca818111b94cbd7ce5f3600a9 (diff)
parentc6557e7f2b6ae76a44653d38f835174074c42e05 (diff)
downloadlinux-5941de8eadc287f3f47b87ce9888734ee07d210b.tar.xz
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: [S390] move include/asm-s390 to arch/s390/include/asm
Diffstat (limited to 'arch/s390/include/asm/device.h')
-rw-r--r--arch/s390/include/asm/device.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/s390/include/asm/device.h b/arch/s390/include/asm/device.h
new file mode 100644
index 000000000000..d8f9872b0e2d
--- /dev/null
+++ b/arch/s390/include/asm/device.h
@@ -0,0 +1,7 @@
+/*
+ * Arch specific extensions to struct device
+ *
+ * This file is released under the GPLv2
+ */
+#include <asm-generic/device.h>
+