Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Fix UP build.

+2 -4
+2 -4
arch/sparc/kernel/irq_64.c
··· 268 268 return cpuid; 269 269 } 270 270 #else 271 - static int irq_choose_cpu(unsigned int virt_irq, const struct cpumask *affinity) 272 - { 273 - return real_hard_smp_processor_id(); 274 - } 271 + #define irq_choose_cpu(virt_irq, affinity) \ 272 + real_hard_smp_processor_id() 275 273 #endif 276 274 277 275 static void sun4u_irq_enable(unsigned int virt_irq)