diff options
| author | Olof Johansson <olof@lixom.net> | 2012-03-10 12:15:30 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-03-10 12:15:30 -0500 |
| commit | c454f813501b94cd687bf3c5c0783f815a854905 (patch) | |
| tree | 8b6e1719ba4470e478d719ca0cf935501370e237 /arch/s390/kernel/crash_dump.c | |
| parent | 1ad4fb2f7cbc21db9cdbb53e25ce348d93bbd6e7 (diff) | |
| parent | 63fc5f3bb3d0ca9ab4767a801b518aa6335f87ad (diff) | |
Merge branch 'board' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/boards
* 'board' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP: add minimal support for Nokia RM-696
ARM: OMAP: enable Bluetooth on the PandaBoard
ARM: OMAP: pandora: add support for backlight and poweroff
ARM: OMAP4: board-4430sdp: don't initialize value that is never used
ARM: OMAP3: cm-t3517: add EMAC support
ARM: OMAP: move generic EMAC init to separate file
ARM: OMAP3: RX-51: add explicit mux configuration of tsc2005 control gpios
ARM: OMAP: Add omap_reserve functionality
(includes sync-up to 3.3-rc6)
Diffstat (limited to 'arch/s390/kernel/crash_dump.c')
| -rw-r--r-- | arch/s390/kernel/crash_dump.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/s390/kernel/crash_dump.c b/arch/s390/kernel/crash_dump.c index 39f8fd4438fc..c383ce440d99 100644 --- a/arch/s390/kernel/crash_dump.c +++ b/arch/s390/kernel/crash_dump.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 12 | #include <linux/gfp.h> | 12 | #include <linux/gfp.h> |
| 13 | #include <linux/slab.h> | 13 | #include <linux/slab.h> |
| 14 | #include <linux/crash_dump.h> | ||
| 15 | #include <linux/bootmem.h> | 14 | #include <linux/bootmem.h> |
| 16 | #include <linux/elf.h> | 15 | #include <linux/elf.h> |
| 17 | #include <asm/ipl.h> | 16 | #include <asm/ipl.h> |