diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 20:43:08 +0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 20:43:08 +0400 |
commit | f1b0c8d3d3b5ff9c0b14bb2383a4bc38d8922bd1 (patch) | |
tree | b7d9f439d5b99d8b03bf490d4b17156414e48d45 /include/asm-x86/mach-default/setup_arch.h | |
parent | d591b0a3ae25f587d0c4da1e1d1a425143590790 (diff) | |
parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
download | linux-f1b0c8d3d3b5ff9c0b14bb2383a4bc38d8922bd1.tar.xz |
Merge branch 'linus' into x86/amd-iommu
Diffstat (limited to 'include/asm-x86/mach-default/setup_arch.h')
-rw-r--r-- | include/asm-x86/mach-default/setup_arch.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/asm-x86/mach-default/setup_arch.h b/include/asm-x86/mach-default/setup_arch.h index 605e3ccb991b..38846208b548 100644 --- a/include/asm-x86/mach-default/setup_arch.h +++ b/include/asm-x86/mach-default/setup_arch.h @@ -1,7 +1,3 @@ /* Hook to call BIOS initialisation function */ /* no action for generic */ - -#ifndef ARCH_SETUP -#define ARCH_SETUP -#endif |