diff --git a/[refs] b/[refs] index 8bafc6b85f93..1dead777cf40 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a4fc520a0ff92810eea46d74bf742ef73849302e +refs/heads/master: 0577f148b5e9a773020e3da1e6332a7c6df9d601 diff --git a/trunk/arch/x86_64/kernel/pci-calgary.c b/trunk/arch/x86_64/kernel/pci-calgary.c index f541fb564d92..caf84e4e4ca9 100644 --- a/trunk/arch/x86_64/kernel/pci-calgary.c +++ b/trunk/arch/x86_64/kernel/pci-calgary.c @@ -117,7 +117,7 @@ static int calgary_detected __read_mostly = 0; struct calgary_bus_info { void *tce_space; - int translation_disabled; + unsigned char translation_disabled; signed char phbid; };