diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2006-04-20 17:25:10 (GMT) |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2006-04-20 17:25:10 (GMT) |
| commit | b86d7622b33892b1dafe761a7a9eaeeab9f3816b (patch) | |
| tree | 56b1b6fc978166abce4afa8e9dee0af94bfc3cd6 /common/devices.c | |
| parent | f8edca2e9a128f526b1fe6f997f7adb852cf5b3c (diff) | |
| parent | 56a4a63c106cc317fc0fe42686a99416fc469f5b (diff) | |
| download | u-boot-b86d7622b33892b1dafe761a7a9eaeeab9f3816b.tar.xz | |
Merge branch 'master' of rsync://rsync.denx.de/git/u-boot
Diffstat (limited to 'common/devices.c')
| -rw-r--r-- | common/devices.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/devices.c b/common/devices.c index bd4dfa0..ddf8f8e 100644 --- a/common/devices.c +++ b/common/devices.c @@ -34,6 +34,8 @@ #include <i2c.h> #endif +DECLARE_GLOBAL_DATA_PTR; + list_t devlist = 0; device_t *stdio_devices[] = { NULL, NULL, NULL }; char *stdio_names[MAX_FILES] = { "stdin", "stdout", "stderr" }; @@ -160,8 +162,6 @@ int device_deregister(char *devname) int devices_init (void) { #ifndef CONFIG_ARM /* already relocated for current ARM implementation */ - DECLARE_GLOBAL_DATA_PTR; - ulong relocation_offset = gd->reloc_off; int i; |