diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-05 07:04:34 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-05 07:04:34 +0200 |
| commit | fc600432cd23e35c85de2ff4468d816d6938a112 (patch) | |
| tree | c191c51e4458ec31c1d8254f01e23b2e1574b6f4 /arch/m68k/include/asm/device.h | |
| parent | ASoC: omap-mcbsp: Single macro for st channel volume set/get (diff) | |
| parent | Linux 3.6-rc4 (diff) | |
| download | linux-fc600432cd23e35c85de2ff4468d816d6938a112.tar.xz linux-fc600432cd23e35c85de2ff4468d816d6938a112.zip | |
Merge tag 'v3.6-rc4' into asoc-omap
Linux 3.6-rc4
Diffstat (limited to 'arch/m68k/include/asm/device.h')
| -rw-r--r-- | arch/m68k/include/asm/device.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/m68k/include/asm/device.h b/arch/m68k/include/asm/device.h deleted file mode 100644 index d8f9872b0e2d..000000000000 --- a/arch/m68k/include/asm/device.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - * Arch specific extensions to struct device - * - * This file is released under the GPLv2 - */ -#include <asm-generic/device.h> - |