linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the moduleh tree with the gpio tree
@ 2011-10-14  6:02 Stephen Rothwell
  0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2011-10-14  6:02 UTC (permalink / raw)
  To: Paul Gortmaker; +Cc: linux-next, linux-kernel, Tomoya MORINAGA, Grant Likely

[-- Attachment #1: Type: text/plain, Size: 1236 bytes --]

Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in
drivers/gpio/gpio-pch.c between commit 38eb18a6f92d ("gpio-pch: Support
interrupt function") from the gpio tree and commit d331aa9b3a0b
("drivers/gpio: Fix drivers who are implicit users of module.h") from the
moduleh tree.

Just context changes.  I fxied it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/gpio/gpio-pch.c
index 46b5209,c9c4297..0000000
--- a/drivers/gpio/gpio-pch.c
+++ b/drivers/gpio/gpio-pch.c
@@@ -17,17 -17,10 +17,18 @@@
  #include <linux/kernel.h>
  #include <linux/pci.h>
  #include <linux/gpio.h>
 +#include <linux/interrupt.h>
 +#include <linux/irq.h>
+ #include <linux/module.h>
  
 -#define PCH_GPIO_ALL_PINS	0xfff /* Mask for GPIO pins 0 to 11 */
 -#define GPIO_NUM_PINS	12	/* Specifies number of GPIO PINS GPIO0-GPIO11 */
 +#define PCH_EDGE_FALLING	0
 +#define PCH_EDGE_RISING		BIT(0)
 +#define PCH_LEVEL_L		BIT(1)
 +#define PCH_LEVEL_H		(BIT(0) | BIT(1))
 +#define PCH_EDGE_BOTH		BIT(2)
 +#define PCH_IM_MASK		(BIT(0) | BIT(1) | BIT(2))
 +
 +#define PCH_IRQ_BASE		24
  
  struct pch_regs {
  	u32	ien;

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

* linux-next: manual merge of the moduleh tree with the gpio tree
@ 2011-10-14  6:02 Stephen Rothwell
  0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2011-10-14  6:02 UTC (permalink / raw)
  To: Paul Gortmaker; +Cc: linux-next, linux-kernel, Tomoya MORINAGA, Grant Likely

[-- Attachment #1: Type: text/plain, Size: 1146 bytes --]

Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in
drivers/gpio/gpio-ml-ioh.c between commit 54be566317b6 ("gpio-ml-ioh:
Support interrupt function") from the gpio tree and commit d331aa9b3a0b
("drivers/gpio: Fix drivers who are implicit users of module.h") from the
moduleh tree.

Just context changes.  I fxied it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/gpio/gpio-ml-ioh.c
index 274fd4d,16c7b5b..0000000
--- a/drivers/gpio/gpio-ml-ioh.c
+++ b/drivers/gpio/gpio-ml-ioh.c
@@@ -18,18 -18,8 +18,19 @@@
  #include <linux/slab.h>
  #include <linux/pci.h>
  #include <linux/gpio.h>
 +#include <linux/interrupt.h>
 +#include <linux/irq.h>
+ #include <linux/module.h>
  
 +#define IOH_EDGE_FALLING	0
 +#define IOH_EDGE_RISING		BIT(0)
 +#define IOH_LEVEL_L		BIT(1)
 +#define IOH_LEVEL_H		(BIT(0) | BIT(1))
 +#define IOH_EDGE_BOTH		BIT(2)
 +#define IOH_IM_MASK		(BIT(0) | BIT(1) | BIT(2))
 +
 +#define IOH_IRQ_BASE		0
 +
  #define PCI_VENDOR_ID_ROHM             0x10DB
  
  struct ioh_reg_comn {

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2011-10-14  6:02 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-10-14  6:02 linux-next: manual merge of the moduleh tree with the gpio tree Stephen Rothwell
2011-10-14  6:02 Stephen Rothwell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).