From: Ingo Molnar <mingo@elte.hu>
Date: Sat, 26 Jul 2008 14:30:19 +0000 (+0200)
Subject: Merge branch 'x86/urgent' into x86/core
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=10d3285d0b3af641ee446f0be8f0a7f40cb515b6;p=linux-beck.git

Merge branch 'x86/urgent' into x86/core

Conflicts:

	include/asm-x86/gpio.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

10d3285d0b3af641ee446f0be8f0a7f40cb515b6
diff --cc include/asm-x86/gpio.h
index f9e8f8918a9d,c4c91b37c104..497fb980d962
--- a/include/asm-x86/gpio.h
+++ b/include/asm-x86/gpio.h
@@@ -57,6 -53,4 +53,4 @@@ static inline int irq_to_gpio(unsigned 
  
  #endif /* CONFIG_GPIOLIB */
  
- #endif /* CONFIG_X86_RDC321X */
- 
 -#endif /* _ASM_I386_GPIO_H */
 +#endif /* ASM_X86__GPIO_H */