diff options
| author | Tom Rini <trini@konsulko.com> | 2015-12-04 17:50:34 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-12-04 17:50:34 -0500 |
| commit | 9eed48c8bec98425dbd995dd72c40e9ad7a8c26b (patch) | |
| tree | 187374b183ff589b43b7f8706829500ad2664dc2 /arch/sparc/include/asm/global_data.h | |
| parent | a85670e40da1ef4f299effb73c36e48d39d50106 (diff) | |
| parent | 7a4fb11b85939b47738283c3a7ae7f461468e274 (diff) | |
Merge branch 'master' of http://git.denx.de/u-boot-sparc
Diffstat (limited to 'arch/sparc/include/asm/global_data.h')
| -rw-r--r-- | arch/sparc/include/asm/global_data.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/sparc/include/asm/global_data.h b/arch/sparc/include/asm/global_data.h index 0680a56758d..af38d17b0dd 100644 --- a/arch/sparc/include/asm/global_data.h +++ b/arch/sparc/include/asm/global_data.h @@ -2,8 +2,8 @@ * (C) Copyright 2002-2010 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * (C) Copyright 2007 - * Daniel Hellstrom, Gaisler Research, daniel@gaisler.com. + * (C) Copyright 2007, 2015 + * Daniel Hellstrom, Cobham, Gaisler, daniel@gaisler.com. * * SPDX-License-Identifier: GPL-2.0+ */ @@ -15,7 +15,12 @@ /* Architecture-specific global data */ struct arch_global_data { + void *timer; void *uart; + unsigned int uart_freq; +#ifdef CONFIG_LEON3 + unsigned int snooping_available; +#endif }; #include <asm-generic/global_data.h> |