diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-03 18:31:19 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-03 18:31:19 -1000 |
| commit | bb609316d406c6e4dc29e0219d40e70837f70f8a (patch) | |
| tree | 7b1955617328df941a4afd517594c062bcf44812 /drivers | |
| parent | c15f6d8d47152762a2819173599ce0eb135297f1 (diff) | |
| parent | 8d73b18079613baf75019a920ce6a1ac0dac8b5b (diff) | |
| download | linux-bb609316d406c6e4dc29e0219d40e70837f70f8a.tar.bz2 | |
Merge branch 'parisc-4.17-4' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc fixes from Helge Deller:
"Fix two section mismatches, convert to read_persistent_clock64(), add
further documentation regarding the HPMC crash handler and make
bzImage the default build target"
* 'parisc-4.17-4' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: Fix section mismatches
parisc: drivers.c: Fix section mismatches
parisc: time: Convert read_persistent_clock() to read_persistent_clock64()
parisc: Document rules regarding checksum of HPMC handler
parisc: Make bzImage default build target
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/parisc/ccio-dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c index acba1f56af3e..126cf19e869b 100644 --- a/drivers/parisc/ccio-dma.c +++ b/drivers/parisc/ccio-dma.c @@ -1263,7 +1263,7 @@ static struct parisc_driver ccio_driver __refdata = { * I/O Page Directory, the resource map, and initalizing the * U2/Uturn chip into virtual mode. */ -static void +static void __init ccio_ioc_init(struct ioc *ioc) { int i; |