diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-29 19:06:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-29 19:06:59 -0700 |
| commit | ce8aa48929449b491149b6c87861ac69cb797a42 (patch) | |
| tree | 6fd8482c0b34842dfcefdaedcd86a0dbf8b0a71d /arch/sh | |
| parent | b97db0751028b5b911918979da68bfbbbb344d3a (diff) | |
| parent | 362f2b098b188ede9c4350cc20e58040dbfa515e (diff) | |
| download | op-kernel-dev-ce8aa48929449b491149b6c87861ac69cb797a42.zip op-kernel-dev-ce8aa48929449b491149b6c87861ac69cb797a42.tar.gz | |
Merge branch 'for-3.10-async' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
Pull async update from Tejun Heo:
"This contains three cleanup patches for async from Lai. All three
patches are essentially cosmetic."
* 'for-3.10-async' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
async: rename and redefine async_func_ptr
async: remove unused @node from struct async_domain
async: simplify lowest_in_progress()
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/drivers/pci/pcie-sh7786.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/drivers/pci/pcie-sh7786.c b/arch/sh/drivers/pci/pcie-sh7786.c index c2c85f6..a162a7f 100644 --- a/arch/sh/drivers/pci/pcie-sh7786.c +++ b/arch/sh/drivers/pci/pcie-sh7786.c @@ -35,7 +35,7 @@ static unsigned int nr_ports; static struct sh7786_pcie_hwops { int (*core_init)(void); - async_func_ptr *port_init_hw; + async_func_t port_init_hw; } *sh7786_pcie_hwops; static struct resource sh7786_pci0_resources[] = { |
