diff options
| author | Scott Sweeny <scott.sweeny@timesys.com> | 2010-08-30 14:16:36 -0400 |
|---|---|---|
| committer | Scott Sweeny <scott.sweeny@timesys.com> | 2010-08-30 14:16:36 -0400 |
| commit | e1dce181db649aadcf5c83e9459ebf53dd038073 (patch) | |
| tree | 48438b545d1b4b70354af4c2e0a5411b20194564 /common | |
| parent | e60beb13cf0135dc71c541021487b5ccc4d269cb (diff) | |
no inline and weak attributes
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_ide.c | 6 | ||||
| -rw-r--r-- | common/main.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/common/cmd_ide.c b/common/cmd_ide.c index 8c6ed35b324..7f04577f5fd 100644 --- a/common/cmd_ide.c +++ b/common/cmd_ide.c @@ -532,7 +532,7 @@ __ide_outb(int dev, int port, unsigned char val) dev, port, val, (ATA_CURR_BASE(dev)+CONFIG_SYS_ATA_PORT_ADDR(port))); outb(val, (ATA_CURR_BASE(dev)+CONFIG_SYS_ATA_PORT_ADDR(port))); } -void inline ide_outb (int dev, int port, unsigned char val) +void ide_outb (int dev, int port, unsigned char val) __attribute__((weak, alias("__ide_outb"))); unsigned char inline @@ -544,7 +544,7 @@ __ide_inb(int dev, int port) dev, port, (ATA_CURR_BASE(dev)+CONFIG_SYS_ATA_PORT_ADDR(port)), val); return val; } -unsigned char inline ide_inb(int dev, int port) +unsigned char ide_inb(int dev, int port) __attribute__((weak, alias("__ide_inb"))); #ifdef CONFIG_TUNE_PIO @@ -553,7 +553,7 @@ __ide_set_piomode(int pio_mode) { return 0; } -int inline ide_set_piomode(int pio_mode) +int ide_set_piomode(int pio_mode) __attribute__((weak, alias("__ide_set_piomode"))); #endif diff --git a/common/main.c b/common/main.c index 905d40f0e09..026edd1db23 100644 --- a/common/main.c +++ b/common/main.c @@ -48,7 +48,7 @@ DECLARE_GLOBAL_DATA_PTR; * Board-specific Platform code can reimplement show_boot_progress () if needed */ void inline __show_boot_progress (int val) {} -void inline show_boot_progress (int val) __attribute__((weak, alias("__show_boot_progress"))); +void show_boot_progress (int val) __attribute__((weak, alias("__show_boot_progress"))); #if defined(CONFIG_BOOT_RETRY_TIME) && defined(CONFIG_RESET_TO_RETRY) extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); /* for do_reset() prototype */ |