diff options
author | Dave Jones <davej@redhat.com> | 2006-12-12 23:41:41 +0100 |
---|---|---|
committer | Dave Jones <davej@redhat.com> | 2006-12-12 23:41:41 +0100 |
commit | c4366889dda8110247be59ca41fddb82951a8c26 (patch) | |
tree | 705c1a996bed8fd48ce94ff33ec9fd00f9b94875 /include/asm-m68k/device.h | |
parent | [CPUFREQ] Longhaul - Add support for CN400 (diff) | |
parent | [PATCH] remove config ordering/dependency between ucb1400-ts and sound subsystem (diff) | |
download | linux-c4366889dda8110247be59ca41fddb82951a8c26.tar.xz linux-c4366889dda8110247be59ca41fddb82951a8c26.zip |
Merge ../linus
Conflicts:
drivers/cpufreq/cpufreq.c
Diffstat (limited to 'include/asm-m68k/device.h')
-rw-r--r-- | include/asm-m68k/device.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/asm-m68k/device.h b/include/asm-m68k/device.h new file mode 100644 index 000000000000..d8f9872b0e2d --- /dev/null +++ b/include/asm-m68k/device.h @@ -0,0 +1,7 @@ +/* + * Arch specific extensions to struct device + * + * This file is released under the GPLv2 + */ +#include <asm-generic/device.h> + |