From: Thomas Gleixner Date: Wed, 30 Jan 2008 22:27:58 +0000 (+0100) Subject: alpha: fix x86.git merge build error X-Git-Tag: v2.6.25-rc1~1132^2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c18d1250c7425dddd2633ce4eaf03d5015e68a0f;p=pandora-kernel.git alpha: fix x86.git merge build error a5a19c63f4e55e32dc0bc3d936d7f94793d8b380 removed the include of asm/pgalloc.h from asm-generic/tlb.h. That works fine on most architectures, but broke ALPHA. Fixup ALPHA by adding the include to asm-alpha/tlbflush.h Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar --- Reading git-diff-tree failed