Hi John,
Today's linux-next merge of the wireless-next tree got a conflict in
include/linux/bcma/bcma_driver_chipcommon.h between commits ef85fb28305f
("bcma: add locking around GPIO register accesses") and cf0936b06d8e
("bcma: add GPIO driver") from the mips tree and commits a22a3114a820
("bcma: add methods for watchdog driver") and a4855f39d4eb ("bcma:
register watchdog driver") from the wireless-next tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc include/linux/bcma/bcma_driver_chipcommon.h
index a74e33f,e513591..0000000
--- a/include/linux/bcma/bcma_driver_chipcommon.h
+++ b/include/linux/bcma/bcma_driver_chipcommon.h
@@@ -1,7 -1,7 +1,8 @@@
#ifndef LINUX_BCMA_DRIVER_CC_H_
#define LINUX_BCMA_DRIVER_CC_H_
+#include <linux/gpio.h>
+ #include <linux/platform_device.h>
/** ChipCommon core registers. **/
#define BCMA_CC_ID 0x0000
@@@ -572,12 -572,8 +573,14 @@@ struct bcma_drv_cc
int nr_serial_ports;
struct bcma_serial_port serial_ports[4];
#endif /* CONFIG_BCMA_DRIVER_MIPS */
+ u32 ticks_per_ms;
+ struct platform_device *watchdog;
+
+ /* Lock for GPIO register access. */
+ spinlock_t gpio_lock;
+#ifdef CONFIG_BCMA_DRIVER_GPIO
+ struct gpio_chip gpio;
+#endif
};
/* Register access */
Attachment:
pgpKM_oWIOFGj.pgp
Description: PGP signature
