diff options
| author | Markus Klotzbuecher <mk@denx.de> | 2007-04-23 13:17:22 +0200 |
|---|---|---|
| committer | Markus Klotzbuecher <mk@pollux.denx.de> | 2007-04-23 13:17:22 +0200 |
| commit | 61ea75aa07838435ec570ac85a2e3fc038844596 (patch) | |
| tree | 20135a513c4c9d0bddb2a8ceaf009a8ed5e8bbdf /include/asm-blackfin/virtconvert.h | |
| parent | e2fb36a57f364016b973b1db255531e07cfefd52 (diff) | |
| parent | 14da5f7675bbb427c469e3f45006e027b6e21db9 (diff) | |
| download | u-boot-imx-61ea75aa07838435ec570ac85a2e3fc038844596.zip u-boot-imx-61ea75aa07838435ec570ac85a2e3fc038844596.tar.gz u-boot-imx-61ea75aa07838435ec570ac85a2e3fc038844596.tar.bz2 | |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'include/asm-blackfin/virtconvert.h')
| -rw-r--r-- | include/asm-blackfin/virtconvert.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/asm-blackfin/virtconvert.h b/include/asm-blackfin/virtconvert.h index 769f5a0..9eda9f8 100644 --- a/include/asm-blackfin/virtconvert.h +++ b/include/asm-blackfin/virtconvert.h @@ -1,7 +1,7 @@ /* * U-boot - virtconvert.h * - * Copyright (c) 2005 blackfin.uclinux.org + * Copyright (c) 2005-2007 Analog Devices Inc. * * See file CREDITS for list of people who contributed to this * project. @@ -18,8 +18,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + * MA 02110-1301 USA */ #ifndef __BLACKFIN_VIRT_CONVERT__ @@ -33,7 +33,6 @@ #include <linux/config.h> #include <asm/setup.h> -#include <asm/page.h> #define mm_vtop(vaddr) ((unsigned long) vaddr) #define mm_ptov(vaddr) ((unsigned long) vaddr) |