Merge branches 'sh/pm-runtime' and 'common/clkfwk' into sh-fixes-for-linus

This commit is contained in:
Paul Mundt
2011-11-11 16:16:25 +09:00
3472 changed files with 65432 additions and 35740 deletions

View File

@@ -132,8 +132,6 @@ struct plat_sci_port {
struct plat_sci_port_ops *ops;
struct device *dma_dev;
unsigned int dma_slave_tx;
unsigned int dma_slave_rx;
};