diff --git a/[refs] b/[refs] index dd1d427906c4..9a7cdb983232 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3076a492a5e8dd624f237886646b35d12193502d +refs/heads/master: f271a6f557497830f3995138b0c78d8634b33863 diff --git a/trunk/include/asm-x86_64/proto.h b/trunk/include/asm-x86_64/proto.h index 977fe58e971c..8abf2a43c944 100644 --- a/trunk/include/asm-x86_64/proto.h +++ b/trunk/include/asm-x86_64/proto.h @@ -127,7 +127,6 @@ extern int fix_aperture; #define iommu_aperture 0 #define iommu_aperture_allowed 0 #endif -extern int force_iommu; extern int reboot_force; extern int notsc_setup(char *);