Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 344211
b: refs/heads/master
c: 3e270ba
h: refs/heads/master
i:
  344209: ae3e099
  344207: 47511b7
v: v3
  • Loading branch information
Shiraz Hashim authored and Viresh Kumar committed Nov 26, 2012
1 parent cc5dac2 commit c621b33
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 07e812a0aeaaf21a23b3db5048a65c7042248321
refs/heads/master: 3e270ba6e9158f0958e46a606cbeb14ddaf6979b
2 changes: 0 additions & 2 deletions trunk/arch/arm/mach-spear13xx/spear1310.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,7 @@

/* ssp device registration */
static struct pl022_ssp_controller ssp1_plat_data = {
.bus_id = 0,
.enable_dma = 0,
.num_chipselect = 3,
};

/* Add SPEAr1310 auxdata to pass platform data */
Expand Down
2 changes: 0 additions & 2 deletions trunk/arch/arm/mach-spear13xx/spear13xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,10 @@ static struct dw_dma_slave ssp_dma_param[] = {
};

struct pl022_ssp_controller pl022_plat_data = {
.bus_id = 0,
.enable_dma = 1,
.dma_filter = dw_dma_filter,
.dma_rx_param = &ssp_dma_param[1],
.dma_tx_param = &ssp_dma_param[0],
.num_chipselect = 3,
};

/* CF device registration */
Expand Down

0 comments on commit c621b33

Please sign in to comment.