From: Ingo Molnar <mingo@elte.hu>
Date: Sat, 26 Jul 2008 13:30:40 +0000 (+0200)
Subject: Merge branch 'linus' into x86/header-guards
X-Git-Tag: v2.6.28-rc1~734^2~4^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=1503af661947b7a4a09355cc2ae6aa0d43f16776;p=linux-2.6-omap-h63xx.git

Merge branch 'linus' into x86/header-guards

Conflicts:

	include/asm-x86/gpio.h
	include/asm-x86/ide.h

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

1503af661947b7a4a09355cc2ae6aa0d43f16776
diff --cc include/asm-x86/gpio.h
index f269ff9cd40,116e9147fe6..f9e8f8918a9
--- a/include/asm-x86/gpio.h
+++ b/include/asm-x86/gpio.h
@@@ -1,6 -1,62 +1,62 @@@
- #ifndef ASM_X86__GPIO_H
- #define ASM_X86__GPIO_H
+ /*
+  * Generic GPIO API implementation for x86.
+  *
+  * Derived from the generic GPIO API for powerpc:
+  *
+  * Copyright (c) 2007-2008  MontaVista Software, Inc.
+  *
+  * Author: Anton Vorontsov <avorontsov@ru.mvista.com>
+  *
+  * This program is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation; either version 2 of the License, or
+  * (at your option) any later version.
+  */
  
+ #ifndef _ASM_I386_GPIO_H
+ #define _ASM_I386_GPIO_H
+ 
+ #ifdef CONFIG_X86_RDC321X
  #include <gpio.h>
+ #else /* CONFIG_X86_RDC321X */
+ 
+ #include <asm-generic/gpio.h>
+ 
+ #ifdef CONFIG_GPIOLIB
+ 
+ /*
+  * Just call gpiolib.
+  */
+ static inline int gpio_get_value(unsigned int gpio)
+ {
+ 	return __gpio_get_value(gpio);
+ }
+ 
+ static inline void gpio_set_value(unsigned int gpio, int value)
+ {
+ 	__gpio_set_value(gpio, value);
+ }
+ 
+ static inline int gpio_cansleep(unsigned int gpio)
+ {
+ 	return __gpio_cansleep(gpio);
+ }
+ 
+ /*
+  * Not implemented, yet.
+  */
+ static inline int gpio_to_irq(unsigned int gpio)
+ {
+ 	return -ENOSYS;
+ }
+ 
+ static inline int irq_to_gpio(unsigned int irq)
+ {
+ 	return -EINVAL;
+ }
+ 
+ #endif /* CONFIG_GPIOLIB */
+ 
+ #endif /* CONFIG_X86_RDC321X */
  
 -#endif /* _ASM_I386_GPIO_H */
 +#endif /* ASM_X86__GPIO_H */
diff --cc include/asm-x86/processor-flags.h
index ae1d434f197,eff2ecd7fff..5dd79774f69
--- a/include/asm-x86/processor-flags.h
+++ b/include/asm-x86/processor-flags.h
@@@ -93,5 -94,6 +94,6 @@@
  #else
  #define X86_VM_MASK	0 /* No VM86 support */
  #endif
+ #endif
  
 -#endif	/* __ASM_I386_PROCESSOR_FLAGS_H */
 +#endif /* ASM_X86__PROCESSOR_FLAGS_H */