Skip to content

L
linux
Commit 30f2e50f authored by Ralf Bächle's avatar Ralf Bächle Committed by Linus Torvalds
Browse files
Options

[PATCH] mips: update config symbols 

CONFIG_DECSTATION is now CONFIG_MACH_DECSTATION ...
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 76bff810
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 17 deletions
drivers/char/rtc.c
View file @ 30f2e50f
...@@ -508,7 +508,7 @@ static int rtc_do_ioctl(unsigned int cmd, unsigned long arg, int kernel) ...@@ -508,7 +508,7 @@ static int rtc_do_ioctl(unsigned int cmd, unsigned long arg, int kernel)
unsigned char mon, day, hrs, min, sec, leap_yr; unsigned char mon, day, hrs, min, sec, leap_yr;
unsigned char save_control, save_freq_select; unsigned char save_control, save_freq_select;
unsigned int yrs; unsigned int yrs;
#ifdef CONFIG_DECSTATION #ifdef CONFIG_MACH_DECSTATION
unsigned int real_yrs; unsigned int real_yrs;
#endif #endif
...@@ -544,7 +544,7 @@ static int rtc_do_ioctl(unsigned int cmd, unsigned long arg, int kernel) ...@@ -544,7 +544,7 @@ static int rtc_do_ioctl(unsigned int cmd, unsigned long arg, int kernel)
return -EINVAL; return -EINVAL;
spin_lock_irq(&rtc_lock); spin_lock_irq(&rtc_lock);
#ifdef CONFIG_DECSTATION #ifdef CONFIG_MACH_DECSTATION
real_yrs = yrs; real_yrs = yrs;
yrs = 72; yrs = 72;
...@@ -583,7 +583,7 @@ static int rtc_do_ioctl(unsigned int cmd, unsigned long arg, int kernel) ...@@ -583,7 +583,7 @@ static int rtc_do_ioctl(unsigned int cmd, unsigned long arg, int kernel)
save_freq_select = CMOS_READ(RTC_FREQ_SELECT); save_freq_select = CMOS_READ(RTC_FREQ_SELECT);
CMOS_WRITE((save_freq_select|RTC_DIV_RESET2), RTC_FREQ_SELECT); CMOS_WRITE((save_freq_select|RTC_DIV_RESET2), RTC_FREQ_SELECT);
#ifdef CONFIG_DECSTATION #ifdef CONFIG_MACH_DECSTATION
CMOS_WRITE(real_yrs, RTC_DEC_YEAR); CMOS_WRITE(real_yrs, RTC_DEC_YEAR);
#endif #endif
CMOS_WRITE(yrs, RTC_YEAR); CMOS_WRITE(yrs, RTC_YEAR);
...@@ -1213,7 +1213,7 @@ void rtc_get_rtc_time(struct rtc_time *rtc_tm) ...@@ -1213,7 +1213,7 @@ void rtc_get_rtc_time(struct rtc_time *rtc_tm)
{ {
unsigned long uip_watchdog = jiffies; unsigned long uip_watchdog = jiffies;
unsigned char ctrl; unsigned char ctrl;
#ifdef CONFIG_DECSTATION #ifdef CONFIG_MACH_DECSTATION
unsigned int real_year; unsigned int real_year;
#endif #endif
...@@ -1246,7 +1246,7 @@ void rtc_get_rtc_time(struct rtc_time *rtc_tm) ...@@ -1246,7 +1246,7 @@ void rtc_get_rtc_time(struct rtc_time *rtc_tm)
rtc_tm->tm_mday = CMOS_READ(RTC_DAY_OF_MONTH); rtc_tm->tm_mday = CMOS_READ(RTC_DAY_OF_MONTH);
rtc_tm->tm_mon = CMOS_READ(RTC_MONTH); rtc_tm->tm_mon = CMOS_READ(RTC_MONTH);
rtc_tm->tm_year = CMOS_READ(RTC_YEAR); rtc_tm->tm_year = CMOS_READ(RTC_YEAR);
#ifdef CONFIG_DECSTATION #ifdef CONFIG_MACH_DECSTATION
real_year = CMOS_READ(RTC_DEC_YEAR); real_year = CMOS_READ(RTC_DEC_YEAR);
#endif #endif
ctrl = CMOS_READ(RTC_CONTROL); ctrl = CMOS_READ(RTC_CONTROL);
...@@ -1262,7 +1262,7 @@ void rtc_get_rtc_time(struct rtc_time *rtc_tm) ...@@ -1262,7 +1262,7 @@ void rtc_get_rtc_time(struct rtc_time *rtc_tm)
BCD_TO_BIN(rtc_tm->tm_year); BCD_TO_BIN(rtc_tm->tm_year);
} }
#ifdef CONFIG_DECSTATION #ifdef CONFIG_MACH_DECSTATION
rtc_tm->tm_year += real_year - 72; rtc_tm->tm_year += real_year - 72;
#endif #endif
......
drivers/mtd/devices/Kconfig
View file @ 30f2e50f
...@@ -40,7 +40,7 @@ config MTD_PMC551_DEBUG ...@@ -40,7 +40,7 @@ config MTD_PMC551_DEBUG
config MTD_MS02NV config MTD_MS02NV
tristate "DEC MS02-NV NVRAM module support" tristate "DEC MS02-NV NVRAM module support"
depends on CONFIG_DECSTATION depends on CONFIG_MACH_DECSTATION
help help
Support for NVRAM module on DECstation. Support for NVRAM module on DECstation.
......
drivers/tc/zs.c
View file @ 30f2e50f
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/wbflush.h> #include <asm/wbflush.h>
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
#ifdef CONFIG_DECSTATION #ifdef CONFIG_MACH_DECSTATION
#include <asm/dec/interrupts.h> #include <asm/dec/interrupts.h>
#include <asm/dec/machtype.h> #include <asm/dec/machtype.h>
#include <asm/dec/tc.h> #include <asm/dec/tc.h>
...@@ -111,7 +111,7 @@ struct zs_parms { ...@@ -111,7 +111,7 @@ struct zs_parms {
static struct zs_parms *zs_parms; static struct zs_parms *zs_parms;
#ifdef CONFIG_DECSTATION #ifdef CONFIG_MACH_DECSTATION
static struct zs_parms ds_parms = { static struct zs_parms ds_parms = {
scc0 : SCC0, scc0 : SCC0,
scc1 : SCC1, scc1 : SCC1,
...@@ -132,7 +132,7 @@ static struct zs_parms baget_parms = { ...@@ -132,7 +132,7 @@ static struct zs_parms baget_parms = {
}; };
#endif #endif
#ifdef CONFIG_DECSTATION #ifdef CONFIG_MACH_DECSTATION
#define DS_BUS_PRESENT (IOASIC) #define DS_BUS_PRESENT (IOASIC)
#else #else
#define DS_BUS_PRESENT 0 #define DS_BUS_PRESENT 0
...@@ -1689,7 +1689,7 @@ static void __init probe_sccs(void) ...@@ -1689,7 +1689,7 @@ static void __init probe_sccs(void)
* system_base for this case :-(. HK * system_base for this case :-(. HK
*/ */
switch(mips_machtype) { switch(mips_machtype) {
#ifdef CONFIG_DECSTATION #ifdef CONFIG_MACH_DECSTATION
case MACH_DS5000_2X0: case MACH_DS5000_2X0:
system_base = 0xbf800000; system_base = 0xbf800000;
n_chips = 2; n_chips = 2;
......
include/asm-generic/rtc.h
View file @ 30f2e50f
...@@ -46,7 +46,7 @@ static inline unsigned int get_rtc_time(struct rtc_time *time) ...@@ -46,7 +46,7 @@ static inline unsigned int get_rtc_time(struct rtc_time *time)
{ {
unsigned long uip_watchdog = jiffies; unsigned long uip_watchdog = jiffies;
unsigned char ctrl; unsigned char ctrl;
#ifdef CONFIG_DECSTATION #ifdef CONFIG_MACH_DECSTATION
unsigned int real_year; unsigned int real_year;
#endif #endif
...@@ -79,7 +79,7 @@ static inline unsigned int get_rtc_time(struct rtc_time *time) ...@@ -79,7 +79,7 @@ static inline unsigned int get_rtc_time(struct rtc_time *time)
time->tm_mday = CMOS_READ(RTC_DAY_OF_MONTH); time->tm_mday = CMOS_READ(RTC_DAY_OF_MONTH);
time->tm_mon = CMOS_READ(RTC_MONTH); time->tm_mon = CMOS_READ(RTC_MONTH);
time->tm_year = CMOS_READ(RTC_YEAR); time->tm_year = CMOS_READ(RTC_YEAR);
#ifdef CONFIG_DECSTATION #ifdef CONFIG_MACH_DECSTATION
real_year = CMOS_READ(RTC_DEC_YEAR); real_year = CMOS_READ(RTC_DEC_YEAR);
#endif #endif
ctrl = CMOS_READ(RTC_CONTROL); ctrl = CMOS_READ(RTC_CONTROL);
...@@ -95,7 +95,7 @@ static inline unsigned int get_rtc_time(struct rtc_time *time) ...@@ -95,7 +95,7 @@ static inline unsigned int get_rtc_time(struct rtc_time *time)
BCD_TO_BIN(time->tm_year); BCD_TO_BIN(time->tm_year);
} }
#ifdef CONFIG_DECSTATION #ifdef CONFIG_MACH_DECSTATION
time->tm_year += real_year - 72; time->tm_year += real_year - 72;
#endif #endif
...@@ -117,7 +117,7 @@ static inline int set_rtc_time(struct rtc_time *time) ...@@ -117,7 +117,7 @@ static inline int set_rtc_time(struct rtc_time *time)
unsigned char mon, day, hrs, min, sec; unsigned char mon, day, hrs, min, sec;
unsigned char save_control, save_freq_select; unsigned char save_control, save_freq_select;
unsigned int yrs; unsigned int yrs;
#ifdef CONFIG_DECSTATION #ifdef CONFIG_MACH_DECSTATION
unsigned int real_yrs, leap_yr; unsigned int real_yrs, leap_yr;
#endif #endif
...@@ -132,7 +132,7 @@ static inline int set_rtc_time(struct rtc_time *time) ...@@ -132,7 +132,7 @@ static inline int set_rtc_time(struct rtc_time *time)
return -EINVAL; return -EINVAL;
spin_lock_irq(&rtc_lock); spin_lock_irq(&rtc_lock);
#ifdef CONFIG_DECSTATION #ifdef CONFIG_MACH_DECSTATION
real_yrs = yrs; real_yrs = yrs;
leap_yr = ((!((yrs + 1900) % 4) && ((yrs + 1900) % 100)) || leap_yr = ((!((yrs + 1900) % 4) && ((yrs + 1900) % 100)) ||
!((yrs + 1900) % 400)); !((yrs + 1900) % 400));
...@@ -174,7 +174,7 @@ static inline int set_rtc_time(struct rtc_time *time) ...@@ -174,7 +174,7 @@ static inline int set_rtc_time(struct rtc_time *time)
save_freq_select = CMOS_READ(RTC_FREQ_SELECT); save_freq_select = CMOS_READ(RTC_FREQ_SELECT);
CMOS_WRITE((save_freq_select|RTC_DIV_RESET2), RTC_FREQ_SELECT); CMOS_WRITE((save_freq_select|RTC_DIV_RESET2), RTC_FREQ_SELECT);
#ifdef CONFIG_DECSTATION #ifdef CONFIG_MACH_DECSTATION
CMOS_WRITE(real_yrs, RTC_DEC_YEAR); CMOS_WRITE(real_yrs, RTC_DEC_YEAR);
#endif #endif
CMOS_WRITE(yrs, RTC_YEAR); CMOS_WRITE(yrs, RTC_YEAR);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7