diff options
| author | Luiz Otavio O Souza <luiz@netgate.com> | 2016-05-23 11:48:19 -0500 |
|---|---|---|
| committer | Luiz Otavio O Souza <luiz@netgate.com> | 2016-05-23 11:48:19 -0500 |
| commit | 7c13e534963f01a3ec0074109ae707100f158fe4 (patch) | |
| tree | 20c7c81dd79965212110f593e841132551191f56 /sys/boot | |
| parent | df341104755e5b8933b69aae30ad8c2307998526 (diff) | |
| parent | 50658bb171fa22e6b22c709dc656302c22721c1e (diff) | |
| download | FreeBSD-src-7c13e534963f01a3ec0074109ae707100f158fe4.zip FreeBSD-src-7c13e534963f01a3ec0074109ae707100f158fe4.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'sys/boot')
| -rw-r--r-- | sys/boot/i386/common/cons.h | 1 | ||||
| -rw-r--r-- | sys/boot/i386/zfsboot/zfsboot.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/sys/boot/i386/common/cons.h b/sys/boot/i386/common/cons.h index fe00a13..73474fb 100644 --- a/sys/boot/i386/common/cons.h +++ b/sys/boot/i386/common/cons.h @@ -28,6 +28,7 @@ void xputc(int c); void putchar(int c); int getc(int fn); int xgetc(int fn); +int getchar(void); int keyhit(unsigned int secs); void getstr(char *cmdstr, size_t cmdstrsize); diff --git a/sys/boot/i386/zfsboot/zfsboot.c b/sys/boot/i386/zfsboot/zfsboot.c index 6fbbc6f..533ad3f 100644 --- a/sys/boot/i386/zfsboot/zfsboot.c +++ b/sys/boot/i386/zfsboot/zfsboot.c @@ -83,7 +83,6 @@ static const unsigned char flags[NOPT] = { }; uint32_t opts; -static const char *const dev_nm[NDEV] = {"ad", "da", "fd"}; static const unsigned char dev_maj[NDEV] = {30, 4, 2}; static char cmd[512]; |
