mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
Merge branch 'amba' of git://git.linaro.org/people/rmk/linux-arm
Pull #2 ARM updates from Russell King: "Further ARM AMBA primecell updates which aren't included directly in the previous commit. I wanted to keep these separate as they're touching stuff outside arch/arm/." * 'amba' of git://git.linaro.org/people/rmk/linux-arm: ARM: 7362/1: AMBA: Add module_amba_driver() helper macro for amba_driver ARM: 7335/1: mach-u300: do away with MMC config files ARM: 7280/1: mmc: mmci: Cache MMCICLOCK and MMCIPOWER register ARM: 7309/1: realview: fix unconnected interrupts on EB11MP ARM: 7230/1: mmc: mmci: Fix PIO read for small SDIO packets ARM: 7227/1: mmc: mmci: Prepare for SDIO before setting up DMA job ARM: 7223/1: mmc: mmci: Fixup use of runtime PM and use autosuspend ARM: 7221/1: mmc: mmci: Change from using legacy suspend ARM: 7219/1: mmc: mmci: Change vdd_handler to a generic ios_handler ARM: 7218/1: mmc: mmci: Provide option to configure bus signal direction ARM: 7217/1: mmc: mmci: Put power register deviations in variant data ARM: 7216/1: mmc: mmci: Do not release spinlock in request_end ARM: 7215/1: mmc: mmci: Increase max_segs from 16 to 128
This commit is contained in:
commit
0d19eac120
17 changed files with 202 additions and 265 deletions
|
|
@ -185,18 +185,7 @@ static struct amba_driver pl030_driver = {
|
|||
.id_table = pl030_ids,
|
||||
};
|
||||
|
||||
static int __init pl030_init(void)
|
||||
{
|
||||
return amba_driver_register(&pl030_driver);
|
||||
}
|
||||
|
||||
static void __exit pl030_exit(void)
|
||||
{
|
||||
amba_driver_unregister(&pl030_driver);
|
||||
}
|
||||
|
||||
module_init(pl030_init);
|
||||
module_exit(pl030_exit);
|
||||
module_amba_driver(pl030_driver);
|
||||
|
||||
MODULE_AUTHOR("Russell King <[email protected]>");
|
||||
MODULE_DESCRIPTION("ARM AMBA PL030 RTC Driver");
|
||||
|
|
|
|||
|
|
@ -431,18 +431,7 @@ static struct amba_driver pl031_driver = {
|
|||
.remove = pl031_remove,
|
||||
};
|
||||
|
||||
static int __init pl031_init(void)
|
||||
{
|
||||
return amba_driver_register(&pl031_driver);
|
||||
}
|
||||
|
||||
static void __exit pl031_exit(void)
|
||||
{
|
||||
amba_driver_unregister(&pl031_driver);
|
||||
}
|
||||
|
||||
module_init(pl031_init);
|
||||
module_exit(pl031_exit);
|
||||
module_amba_driver(pl031_driver);
|
||||
|
||||
MODULE_AUTHOR("Deepak Saxena <[email protected]");
|
||||
MODULE_DESCRIPTION("ARM AMBA PL031 RTC Driver");
|
||||
|
|
|
|||
Loading…
Reference in a new issue