diff options
| author | Jeff Johnston <jjohnstn@redhat.com> | 2009-09-08 21:20:12 +0000 |
|---|---|---|
| committer | Jeff Johnston <jjohnstn@redhat.com> | 2009-09-08 21:20:12 +0000 |
| commit | 580295f6a8ab608942a8e0859421600a5dcbbf0c (patch) | |
| tree | 0e997757004a514d824d8f71dfce50312e598f26 | |
| parent | 18384f4fdfb63ddf9241be2cf0bde2a3e0609f60 (diff) | |
| download | cygnal-580295f6a8ab608942a8e0859421600a5dcbbf0c.tar.gz cygnal-580295f6a8ab608942a8e0859421600a5dcbbf0c.tar.bz2 cygnal-580295f6a8ab608942a8e0859421600a5dcbbf0c.zip | |
2009-09-08 Mike Frysinger <michael.frysinger@analog.com>
* bfin/include/sys/_adi_platform.h: Convert __ASSEMBLY__ to
__ASSEMBLER__.
* bfin/include/sys/pll.h: Likewise
| -rw-r--r-- | libgloss/ChangeLog | 6 | ||||
| -rw-r--r-- | libgloss/bfin/include/sys/_adi_platform.h | 6 | ||||
| -rw-r--r-- | libgloss/bfin/include/sys/pll.h | 8 |
3 files changed, 13 insertions, 7 deletions
diff --git a/libgloss/ChangeLog b/libgloss/ChangeLog index a7cb5784f..66632d2d2 100644 --- a/libgloss/ChangeLog +++ b/libgloss/ChangeLog @@ -1,3 +1,9 @@ +2009-09-08 Mike Frysinger <michael.frysinger@analog.com> + + * bfin/include/sys/_adi_platform.h: Convert __ASSEMBLY__ to + __ASSEMBLER__. + * bfin/include/sys/pll.h: Likewise + 2009-09-08 Jie Zhang <jie.zhang@analog.com> * bfin/Makefile.in (basiccrt.o, basiccrts.o): Don't use diff --git a/libgloss/bfin/include/sys/_adi_platform.h b/libgloss/bfin/include/sys/_adi_platform.h index b343d04b8..1ba612bb4 100644 --- a/libgloss/bfin/include/sys/_adi_platform.h +++ b/libgloss/bfin/include/sys/_adi_platform.h @@ -12,13 +12,13 @@ /* ** Include appropriate header file for platform. -** Copyright (C) 2008 Analog Devices, Inc. +** Copyright (C) 2008, 2009 Analog Devices, Inc. */ #ifndef __ADI_PLATFORM_H #define __ADI_PLATFORM_H -#ifdef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #if defined (__ADSPBF531__) #include <cdefBF531.h> @@ -136,7 +136,7 @@ #error Processor Type Not Supported #endif -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* __INC_BLACKFIN__ */ diff --git a/libgloss/bfin/include/sys/pll.h b/libgloss/bfin/include/sys/pll.h index 835708f3e..59ec014d5 100644 --- a/libgloss/bfin/include/sys/pll.h +++ b/libgloss/bfin/include/sys/pll.h @@ -14,11 +14,11 @@ * * pll.h * - * Copyright (C) 2008 Analog Devices, Inc. + * Copyright (C) 2008, 2009 Analog Devices, Inc. * ************************************************************************/ -#ifdef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #pragma once #pragma system_header #endif @@ -34,7 +34,7 @@ #define NO_STARTUP_SET 0 #define MAX_IN_STARTUP 1 -#ifdef __ASSEMBLY__ +#ifndef __ASSEMBLER__ enum clkctrl_t { /* no modification of PLL rates in CRT startup - default */ @@ -74,7 +74,7 @@ int pll_set_system_vco(int _msel, int _df, int _lockcnt); } #endif -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #ifdef _MISRA_RULES #pragma diag(pop) |