diff options
Diffstat (limited to 'init')
-rw-r--r-- | init/do_mounts.c | 6 | ||||
-rw-r--r-- | init/main.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/init/do_mounts.c b/init/do_mounts.c index 4e11a9aaf14a..b27c11064409 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c | |||
@@ -127,10 +127,10 @@ fail: | |||
127 | * used when disk name of partitioned disk ends on a digit. | 127 | * used when disk name of partitioned disk ends on a digit. |
128 | * | 128 | * |
129 | * If name doesn't have fall into the categories above, we return 0. | 129 | * If name doesn't have fall into the categories above, we return 0. |
130 | * Driverfs is used to check if something is a disk name - it has | 130 | * Sysfs is used to check if something is a disk name - it has |
131 | * all known disks under bus/block/devices. If the disk name | 131 | * all known disks under bus/block/devices. If the disk name |
132 | * contains slashes, name of driverfs node has them replaced with | 132 | * contains slashes, name of sysfs node has them replaced with |
133 | * bangs. try_name() does the actual checks, assuming that driverfs | 133 | * bangs. try_name() does the actual checks, assuming that sysfs |
134 | * is mounted on rootfs /sys. | 134 | * is mounted on rootfs /sys. |
135 | */ | 135 | */ |
136 | 136 | ||
diff --git a/init/main.c b/init/main.c index c9c311cf1771..ff410063e4e1 100644 --- a/init/main.c +++ b/init/main.c | |||
@@ -47,6 +47,7 @@ | |||
47 | #include <linux/rmap.h> | 47 | #include <linux/rmap.h> |
48 | #include <linux/mempolicy.h> | 48 | #include <linux/mempolicy.h> |
49 | #include <linux/key.h> | 49 | #include <linux/key.h> |
50 | #include <net/sock.h> | ||
50 | 51 | ||
51 | #include <asm/io.h> | 52 | #include <asm/io.h> |
52 | #include <asm/bugs.h> | 53 | #include <asm/bugs.h> |
@@ -80,7 +81,6 @@ | |||
80 | static int init(void *); | 81 | static int init(void *); |
81 | 82 | ||
82 | extern void init_IRQ(void); | 83 | extern void init_IRQ(void); |
83 | extern void sock_init(void); | ||
84 | extern void fork_init(unsigned long); | 84 | extern void fork_init(unsigned long); |
85 | extern void mca_init(void); | 85 | extern void mca_init(void); |
86 | extern void sbus_init(void); | 86 | extern void sbus_init(void); |