diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 10:22:15 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 10:22:59 +0200 |
| commit | 07f9479a40cc778bc1462ada11f95b01360ae4ff (patch) | |
| tree | 0676cf38df3844004bb3ebfd99dfa67a4a8998f5 /arch/m68knommu/platform/68328/config.c | |
| parent | 9d5e6bdb3013acfb311ab407eeca0b6a6a3dedbf (diff) | |
| parent | cd2e49e90f1cae7726c9a2c54488d881d7f1cd1c (diff) | |
Merge branch 'master' into for-next
Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.
Diffstat (limited to 'arch/m68knommu/platform/68328/config.c')
| -rw-r--r-- | arch/m68knommu/platform/68328/config.c | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/arch/m68knommu/platform/68328/config.c b/arch/m68knommu/platform/68328/config.c deleted file mode 100644 index a7bd21deb00..00000000000 --- a/arch/m68knommu/platform/68328/config.c +++ /dev/null @@ -1,52 +0,0 @@ -/***************************************************************************/ - -/* - * linux/arch/m68knommu/platform/68328/config.c - * - * Copyright (C) 1993 Hamish Macdonald - * Copyright (C) 1999 D. Jeff Dionne - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file COPYING in the main directory of this archive - * for more details. - * - * VZ Support/Fixes Evan Stawnyczy <e@lineo.ca> - */ - -/***************************************************************************/ - -#include <linux/types.h> -#include <linux/kernel.h> -#include <asm/system.h> -#include <asm/machdep.h> -#include <asm/MC68328.h> - -/***************************************************************************/ - -void m68328_timer_gettod(int *year, int *mon, int *day, int *hour, int *min, int *sec); - -/***************************************************************************/ - -void m68328_reset (void) -{ - local_irq_disable(); - asm volatile ("moveal #0x10c00000, %a0;\n\t" - "moveb #0, 0xFFFFF300;\n\t" - "moveal 0(%a0), %sp;\n\t" - "moveal 4(%a0), %a0;\n\t" - "jmp (%a0);"); -} - -/***************************************************************************/ - -void config_BSP(char *command, int len) -{ - printk(KERN_INFO "\n68328 support D. Jeff Dionne <jeff@uclinux.org>\n"); - printk(KERN_INFO "68328 support Kenneth Albanowski <kjahds@kjshds.com>\n"); - printk(KERN_INFO "68328/Pilot support Bernhard Kuhn <kuhn@lpr.e-technik.tu-muenchen.de>\n"); - - mach_gettod = m68328_timer_gettod; - mach_reset = m68328_reset; -} - -/***************************************************************************/ |