Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 77366
b: refs/heads/master
c: 0d4a89b
h: refs/heads/master
v: v3
  • Loading branch information
Michael Hennerich authored and Bryan Wu committed Jan 27, 2008
1 parent 686314c commit aa36ef6
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: fb5f00492a748facc9f069c95621e05c148edf53
refs/heads/master: 0d4a89bb3eb58f39831186fa6b1542893dbfdc9f
10 changes: 10 additions & 0 deletions trunk/arch/blackfin/mach-bf537/boards/cm_bf537.c
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,12 @@ static struct platform_device rtc_device = {
};
#endif

#if defined(CONFIG_FB_HITACHI_TX09) || defined(CONFIG_FB_HITACHI_TX09_MODULE)
static struct platform_device hitachi_fb_device = {
.name = "hitachi-tx09",
};
#endif

#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
static struct resource smc91x_resources[] = {
{
Expand Down Expand Up @@ -374,6 +380,10 @@ static struct platform_device bfin_pata_device = {
#endif

static struct platform_device *cm_bf537_devices[] __initdata = {
#if defined(CONFIG_FB_HITACHI_TX09) || defined(CONFIG_FB_HITACHI_TX09_MODULE)
&hitachi_fb_device,
#endif

#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
&rtc_device,
#endif
Expand Down
11 changes: 11 additions & 0 deletions trunk/arch/blackfin/mach-bf561/boards/cm_bf561.c
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,13 @@ static struct platform_device bfin_spi0_device = {
#endif /* spi master and devices */


#if defined(CONFIG_FB_HITACHI_TX09) || defined(CONFIG_FB_HITACHI_TX09_MODULE)
static struct platform_device hitachi_fb_device = {
.name = "hitachi-tx09",
};
#endif


#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)

static struct resource smc91x_resources[] = {
Expand Down Expand Up @@ -315,6 +322,10 @@ static struct platform_device bfin_pata_device = {

static struct platform_device *cm_bf561_devices[] __initdata = {

#if defined(CONFIG_FB_HITACHI_TX09) || defined(CONFIG_FB_HITACHI_TX09_MODULE)
&hitachi_fb_device,
#endif

#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
&bfin_uart_device,
#endif
Expand Down

0 comments on commit aa36ef6

Please sign in to comment.