projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "clk: rockchip: reset init state before mmc card initialization"
[firefly-linux-kernel-4.4.55.git]
/
init
/
noinitramfs.c
diff --git
a/init/noinitramfs.c
b/init/noinitramfs.c
index 267739d851791b0a3e4526a3be5fb4944d8b507e..bcc8bcb053eeb05dc095780fcbc276fa2f311bd4 100644
(file)
--- a/
init/noinitramfs.c
+++ b/
init/noinitramfs.c
@@
-21,11
+21,16
@@
#include <linux/stat.h>
#include <linux/kdev_t.h>
#include <linux/syscalls.h>
#include <linux/stat.h>
#include <linux/kdev_t.h>
#include <linux/syscalls.h>
+#include <linux/kconfig.h>
+#include <linux/initramfs.h>
/*
* Create a simple rootfs that is similar to the default initramfs
*/
/*
* Create a simple rootfs that is similar to the default initramfs
*/
-static int __init default_rootfs(void)
+#if !IS_BUILTIN(CONFIG_BLK_DEV_INITRD)
+static
+#endif
+int __init default_rootfs(void)
{
int err;
{
int err;
@@
-49,4
+54,6
@@
out:
printk(KERN_WARNING "Failed to create a rootfs\n");
return err;
}
printk(KERN_WARNING "Failed to create a rootfs\n");
return err;
}
+#if !IS_BUILTIN(CONFIG_BLK_DEV_INITRD)
rootfs_initcall(default_rootfs);
rootfs_initcall(default_rootfs);
+#endif