git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
[pandora-kernel.git]
/
arch
/
blackfin
/
mach-bf537
/
boards
/
tcm_bf537.c
diff --git
a/arch/blackfin/mach-bf537/boards/tcm_bf537.c
b/arch/blackfin/mach-bf537/boards/tcm_bf537.c
index
4f0a2e7
..
a4d62b5
100644
(file)
--- a/
arch/blackfin/mach-bf537/boards/tcm_bf537.c
+++ b/
arch/blackfin/mach-bf537/boards/tcm_bf537.c
@@
-74,7
+74,7
@@
static struct bfin5xx_spi_chip spi_adc_chip_info = {
};
#endif
};
#endif
-#if defined(CONFIG_SND_B
LACKFIN_AD183X) || defined(CONFIG_SND_BLACKFIN
_AD183X_MODULE)
+#if defined(CONFIG_SND_B
F5XX_SOC_AD183X) || defined(CONFIG_SND_BF5XX_SOC
_AD183X_MODULE)
static struct bfin5xx_spi_chip ad1836_spi_chip_info = {
.enable_dma = 0,
.bits_per_word = 16,
static struct bfin5xx_spi_chip ad1836_spi_chip_info = {
.enable_dma = 0,
.bits_per_word = 16,
@@
-113,12
+113,12
@@
static struct spi_board_info bfin_spi_board_info[] __initdata = {
},
#endif
},
#endif
-#if defined(CONFIG_SND_B
LACKFIN_AD183X) || defined(CONFIG_SND_BLACKFIN
_AD183X_MODULE)
+#if defined(CONFIG_SND_B
F5XX_SOC_AD183X) || defined(CONFIG_SND_BF5XX_SOC
_AD183X_MODULE)
{
{
- .modalias = "ad183
6
",
+ .modalias = "ad183
x
",
.max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */
.bus_num = 0,
.max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */
.bus_num = 0,
- .chip_select =
CONFIG_SND_BLACKFIN_SPI_PFBIT
,
+ .chip_select =
4
,
.controller_data = &ad1836_spi_chip_info,
},
#endif
.controller_data = &ad1836_spi_chip_info,
},
#endif
@@
-230,7
+230,7
@@
static struct resource isp1362_hcd_resources[] = {
}, {
.start = IRQ_PG15,
.end = IRQ_PG15,
}, {
.start = IRQ_PG15,
.end = IRQ_PG15,
- .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_
HIGHLEVEL
,
+ .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_
LOWEDGE
,
},
};
},
};