e4862f2f6f
Fairly simple conflicts, the most serious ones are the i.MX ones which I suspect now need another rename. Conflicts: arch/arm/mach-mx2/clock_imx27.c arch/arm/mach-mx2/devices.c arch/arm/mach-omap2/board-rx51-peripherals.c arch/arm/mach-omap2/board-zoom2.c sound/soc/fsl/mpc5200_dma.c sound/soc/fsl/mpc5200_dma.h sound/soc/fsl/mpc8610_hpcd.c sound/soc/pxa/spitz.c
14 lines
337 B
C
14 lines
337 B
C
/*
|
|
* Defines for zoom boards
|
|
*/
|
|
#include <linux/mtd/mtd.h>
|
|
#include <linux/mtd/partitions.h>
|
|
|
|
#define ZOOM_NAND_CS 0
|
|
|
|
extern void __init board_nand_init(struct mtd_partition *, u8 nr_parts, u8 cs);
|
|
extern int __init zoom_debugboard_init(void);
|
|
extern void __init zoom_peripherals_init(void);
|
|
|
|
#define ZOOM2_HEADSET_EXTMUTE_GPIO 153
|