diff options
| author | Michael Brown | 2007-07-28 23:55:31 +0200 |
|---|---|---|
| committer | Michael Brown | 2007-07-28 23:55:31 +0200 |
| commit | e3484e26eba1ba36481d814b35f8561a0f4cb8a6 (patch) | |
| tree | 2b0691c2aae17c8aca095d88ebcc172a7e06805c /src/arch | |
| parent | Ensure clock line is in the idle state before asserting chip select. (diff) | |
| parent | Make has_key() a static inline, rather than omitting it altogether. (diff) | |
| download | ipxe-e3484e26eba1ba36481d814b35f8561a0f4cb8a6.tar.gz ipxe-e3484e26eba1ba36481d814b35f8561a0f4cb8a6.tar.xz ipxe-e3484e26eba1ba36481d814b35f8561a0f4cb8a6.zip | |
Merge branch 'symcheck2'
Diffstat (limited to 'src/arch')
| -rw-r--r-- | src/arch/i386/image/eltorito.c | 2 | ||||
| -rw-r--r-- | src/arch/i386/image/multiboot.c | 2 | ||||
| -rw-r--r-- | src/arch/i386/image/nbi.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/arch/i386/image/eltorito.c b/src/arch/i386/image/eltorito.c index 53e25ca56..9d573106d 100644 --- a/src/arch/i386/image/eltorito.c +++ b/src/arch/i386/image/eltorito.c @@ -298,7 +298,7 @@ static int eltorito_load_disk ( struct image *image, * @v image El Torito file * @ret rc Return status code */ -int eltorito_load ( struct image *image ) { +static int eltorito_load ( struct image *image ) { struct eltorito_boot_entry boot_entry; unsigned long bootcat_offset; int rc; diff --git a/src/arch/i386/image/multiboot.c b/src/arch/i386/image/multiboot.c index ab0b55ace..546de365d 100644 --- a/src/arch/i386/image/multiboot.c +++ b/src/arch/i386/image/multiboot.c @@ -360,7 +360,7 @@ static int multiboot_load_elf ( struct image *image ) { * @v image Multiboot file * @ret rc Return status code */ -int multiboot_load ( struct image *image ) { +static int multiboot_load ( struct image *image ) { struct multiboot_header_info hdr; int rc; diff --git a/src/arch/i386/image/nbi.c b/src/arch/i386/image/nbi.c index 3a66e9cb0..42596f057 100644 --- a/src/arch/i386/image/nbi.c +++ b/src/arch/i386/image/nbi.c @@ -244,7 +244,7 @@ static int nbi_process_segments ( struct image *image, * @v image NBI image * @ret rc Return status code */ -int nbi_load ( struct image *image ) { +static int nbi_load ( struct image *image ) { struct imgheader imgheader; int rc; |
