diff options
| author | dim <dim@FreeBSD.org> | 2014-03-26 07:31:57 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2014-03-26 07:31:57 +0000 |
| commit | fb422e6d310915f9e2641190198698d922f7ef58 (patch) | |
| tree | 8126abc77e6620e23932d186c7b2b75457af47a5 /sys/dev/mk48txx | |
| parent | 5a582ae617991f602ee6f8a954a36fd749aa466c (diff) | |
| download | FreeBSD-src-fb422e6d310915f9e2641190198698d922f7ef58.zip FreeBSD-src-fb422e6d310915f9e2641190198698d922f7ef58.tar.gz | |
MFC r262613:
Merge the projects/clang-sparc64 branch back to head. This brings in
several updates from the llvm and clang trunks to make the sparc64
backend fully functional.
Apart from one patch to sys/sparc64/include/pcpu.h which is still under
discussion, this makes it possible to let clang fully build world and
kernel for sparc64.
Any assistance with testing this on actual sparc64 hardware is greatly
appreciated, as there will unavoidably be bugs left.
Many thanks go to Roman Divacky for his upstream work on getting the
sparc64 backend into shape.
MFC r262985:
Repair a few minor mismerges from r262261 in the clang-sparc64 project
branch. This is also to minimize differences with upstream.
Diffstat (limited to 'sys/dev/mk48txx')
| -rw-r--r-- | sys/dev/mk48txx/mk48txx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/dev/mk48txx/mk48txx.c b/sys/dev/mk48txx/mk48txx.c index de116d0..d1fcfb4 100644 --- a/sys/dev/mk48txx/mk48txx.c +++ b/sys/dev/mk48txx/mk48txx.c @@ -64,7 +64,7 @@ static const struct { bus_size_t clkoff; u_int flags; #define MK48TXX_EXT_REGISTERS 1 /* Has extended register set. */ -} const mk48txx_models[] = { +} mk48txx_models[] = { { "mk48t02", MK48T02_CLKSZ, MK48T02_CLKOFF, 0 }, { "mk48t08", MK48T08_CLKSZ, MK48T08_CLKOFF, 0 }, { "mk48t18", MK48T18_CLKSZ, MK48T18_CLKOFF, 0 }, |
