diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-10 17:37:20 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-10 17:37:20 -0800 |
| commit | c2e08e7ce5ab25a781197a71c5241742e8c9fdfe (patch) | |
| tree | 70cce0b2f4cb82b1670e987169a7790e8467cf41 /arch/unicore32/kernel/setup.c | |
| parent | 28190145543260c155216b9bd3adf57bee50f8b2 (diff) | |
| parent | b3a0aa3ae1c0889ffe8abb2e326d5c74c7c9c097 (diff) | |
Merge branch 'unicore32' of git://github.com/gxt/linux
* 'unicore32' of git://github.com/gxt/linux:
rtc-puv3: solve section mismatch in rtc-puv3.c
rtc-puv3: using module_platform_driver()
i2c-puv3: using module_platform_driver()
rtc-puv3: irq: remove IRQF_DISABLED
unicore32: Remove IRQF_DISABLED
unicore32: Use set_current_blocked()
unicore32: add ioremap_nocache definition
unicore32: delete specified xlate_dev_mem_ptr
of: add include asm/setup.h in drivers/of/fdt.c
unicore32: standardize /proc/iomem "Kernel code" name
Diffstat (limited to 'arch/unicore32/kernel/setup.c')
| -rw-r--r-- | arch/unicore32/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/unicore32/kernel/setup.c b/arch/unicore32/kernel/setup.c index 673d7a89d8ff..87adbf5ebfe0 100644 --- a/arch/unicore32/kernel/setup.c +++ b/arch/unicore32/kernel/setup.c @@ -65,7 +65,7 @@ static char default_command_line[COMMAND_LINE_SIZE] __initdata = CONFIG_CMDLINE; */ static struct resource mem_res[] = { { - .name = "Kernel text", + .name = "Kernel code", .start = 0, .end = 0, .flags = IORESOURCE_MEM |