diff options
author | Len Brown <len.brown@intel.com> | 2005-09-08 09:45:47 +0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2005-09-08 09:45:47 +0400 |
commit | 64e47488c913ac704d465a6af86a26786d1412a5 (patch) | |
tree | d3b0148592963dcde26e4bb35ddfec8b1eaf8e23 /include/asm-ppc/pmac_feature.h | |
parent | 4a35a46bf1cda4737c428380d1db5d15e2590d18 (diff) | |
parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
download | linux-64e47488c913ac704d465a6af86a26786d1412a5.tar.xz |
Merge linux-2.6 with linux-acpi-2.6
Diffstat (limited to 'include/asm-ppc/pmac_feature.h')
-rw-r--r-- | include/asm-ppc/pmac_feature.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-ppc/pmac_feature.h b/include/asm-ppc/pmac_feature.h index 8beb162873f4..e9683bcff19b 100644 --- a/include/asm-ppc/pmac_feature.h +++ b/include/asm-ppc/pmac_feature.h @@ -32,6 +32,7 @@ #define __PPC_ASM_PMAC_FEATURE_H #include <asm/macio.h> +#include <asm/machdep.h> /* * Known Mac motherboard models |