diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-10 15:18:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-10 15:18:41 -0700 |
| commit | d60b9c16d7bae49b75255520abd7dfd2e94627bc (patch) | |
| tree | af8f6071482e34df02601880a0126bd6c365e677 /drivers/block/DAC960.c | |
| parent | Merge branch 'akpm' (Andrew's patch-bomb) (diff) | |
| parent | parisc: move definition of PAGE0 to asm/page.h (diff) | |
| download | linux-dev-d60b9c16d7bae49b75255520abd7dfd2e94627bc.tar.xz linux-dev-d60b9c16d7bae49b75255520abd7dfd2e94627bc.zip | |
Merge branch 'parisc' (PA-RISC compile fixes)
Merge PA-RISC compile fixes from Rolf Eike Beer:
"Since commit d66acc39c7ce ("bitops: Optimise get_order()") getorder.h
includes log2.h which leads to an include loop on PA-RISC, bringing a
bunch of other breakage to light. This patchset fixes the compilation
of the current state of 3.4 on HPPA.
Unchanged against the first version, just added an Ack by Grant."
* emailed from Rolf Eike Beer <eike-kernel@sf-tec.de>: (5 patches)
parisc: move definition of PAGE0 to asm/page.h
parisc: add missing include of asm/page.h to asm/pgtable.h
parisc: drop include of asm/pdc.h from asm/hardware.h
parisc: add missing forward declarations in asm/hardware.h
parisc: add missing includes in asm/spinlock.h
Diffstat (limited to 'drivers/block/DAC960.c')
0 files changed, 0 insertions, 0 deletions