Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05454c26 authored by Kuppuswamy Sathyanarayanan's avatar Kuppuswamy Sathyanarayanan Committed by H. Peter Anvin
Browse files

intel_mid: Renamed *mrst* to *intel_mid* 



Following files contains code that is common to all intel mid
soc's. So renamed them as below.

mrst/mrst.c              -> intel-mid/intel-mid.c
mrst/vrtc.c              -> intel-mid/intel_mid_vrtc.c
mrst/early_printk_mrst.c -> intel-mid/intel_mid_vrtc.c
pci/mrst.c               -> pci/intel_mid_pci.c

Also, renamed the corresponding header files and made changes
to the driver files that included these header files.

To ensure that there are no functional changes, I have compared
the objdump of renamed files before and after rename and found
that the only difference is file name change.

Signed-off-by: default avatarKuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Link: http://lkml.kernel.org/r/1382049336-21316-4-git-send-email-david.a.cohen@linux.intel.com


Signed-off-by: default avatarDavid Cohen <david.a.cohen@linux.intel.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent d8059302

arch/x86/include/asm/mrst.h→arch/x86/include/asm/intel-mid.h

+4 −4
Original line number Diff line number Diff line 
/*

 * mrst.h: Intel Moorestown platform specific setup code

 * intel-mid.h: Intel MID specific setup code

 *

 * (C) Copyright 2009 Intel Corporation

 *
@@ -8,8 +8,8 @@ 
 * as published by the Free Software Foundation; version 2

 * of the License.

 */

#ifndef _ASM_X86_MRST_H

#define _ASM_X86_MRST_H

#ifndef _ASM_X86_INTEL_MID_H

#define _ASM_X86_INTEL_MID_H



#include <linux/sfi.h>
@@ -78,4 +78,4 @@ extern void intel_scu_devices_destroy(void); 


extern void mrst_rtc_init(void);



#endif /* _ASM_X86_MRST_H */
 
#endif /* _ASM_X86_INTEL_MID_H */

arch/x86/include/asm/mrst-vrtc.h→arch/x86/include/asm/intel_mid_vrtc.h

+2 −2
Original line number Diff line number Diff line 
#ifndef _MRST_VRTC_H

#define _MRST_VRTC_H

#ifndef _INTEL_MID_VRTC_H

#define _INTEL_MID_VRTC_H



extern unsigned char vrtc_cmos_read(unsigned char reg);

extern void vrtc_cmos_write(unsigned char val, unsigned char reg);

arch/x86/kernel/apb_timer.c

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 


#include <asm/fixmap.h>

#include <asm/apb_timer.h>

#include <asm/mrst.h>

#include <asm/intel-mid.h>

#include <asm/time.h>



#define APBT_CLOCKEVENT_RATING		110

arch/x86/kernel/early_printk.c

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#include <xen/hvc-console.h>

#include <asm/pci-direct.h>

#include <asm/fixmap.h>

#include <asm/mrst.h>

#include <asm/intel-mid.h>

#include <asm/pgtable.h>

#include <linux/usb/ehci_def.h>

arch/x86/kernel/rtc.c

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#include <asm/vsyscall.h>

#include <asm/x86_init.h>

#include <asm/time.h>

#include <asm/mrst.h>

#include <asm/intel-mid.h>

#include <asm/rtc.h>



#ifdef CONFIG_X86_32