diff options
| author | Max Filippov <jcmvbkbc@gmail.com> | 2017-03-15 02:11:59 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-15 02:11:59 +0000 |
| commit | 609d86bb1b14fbdbbe616dbef6dbadbf0c8371d9 (patch) | |
| tree | 36fecec326e0118f7324dd9a214fc4112c355c6c /arch | |
| parent | 27eb9f28e3e3683125cbeae3988445bb5afc96a1 (diff) | |
| parent | 21096328c97e707f2190b26a06d8b805551a543d (diff) | |
xtensa: move parse_tag_fdt out of #ifdef CONFIG_BLK_DEV_INITRD
am: 21096328c9
Change-Id: I915bb01e5d632c98bd85d640a18f423be57e7a83
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/xtensa/kernel/setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c index 9735691f37f1..49ccbd9022f6 100644 --- a/arch/xtensa/kernel/setup.c +++ b/arch/xtensa/kernel/setup.c @@ -133,6 +133,8 @@ static int __init parse_tag_initrd(const bp_tag_t* tag) __tagtable(BP_TAG_INITRD, parse_tag_initrd); +#endif /* CONFIG_BLK_DEV_INITRD */ + #ifdef CONFIG_OF static int __init parse_tag_fdt(const bp_tag_t *tag) @@ -145,8 +147,6 @@ __tagtable(BP_TAG_FDT, parse_tag_fdt); #endif /* CONFIG_OF */ -#endif /* CONFIG_BLK_DEV_INITRD */ - static int __init parse_tag_cmdline(const bp_tag_t* tag) { strlcpy(command_line, (char *)(tag->data), COMMAND_LINE_SIZE); |