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

Commit 5f8fe427 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://repo.or.cz/cris-mirror 

* 'for-linus' of git://repo.or.cz/cris-mirror:
  CRIS: Cleanup linker script using new linker script macros.
  ARRAY_SIZE changes
  CRIS: convert to asm-generic/hardirq.h
  CRISv10: Don't autonegotiate if autonegotiation is off
  CRIS: fix defconfig build failure
  CRIS: add pgprot_noncached
parents d9fbd9a2 24924ece

arch/cris/arch-v10/kernel/time.c

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 


extern void update_xtime_from_cmos(void);

extern int set_rtc_mmss(unsigned long nowtime);

extern int setup_irq(int, struct irqaction *);

extern int have_rtc;



unsigned long get_ns_in_jiffie(void)

arch/cris/arch-v32/kernel/smp.c

+0 −2
Original line number Diff line number Diff line
@@ -52,8 +52,6 @@ static struct mm_struct* flush_mm; 
static struct vm_area_struct* flush_vma;

static unsigned long flush_addr;



extern int setup_irq(int, struct irqaction *);



/* Mode registers */

static unsigned long irq_regs[NR_CPUS] = {

  regi_irq,

arch/cris/arch-v32/kernel/time.c

+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ unsigned long timer_regs[NR_CPUS] = 


extern void update_xtime_from_cmos(void);

extern int set_rtc_mmss(unsigned long nowtime);

extern int setup_irq(int, struct irqaction *);

extern int have_rtc;



#ifdef CONFIG_CPU_FREQ

arch/cris/arch-v32/mach-a3/io.c

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ struct crisv32_ioport crisv32_ioports[] = { 
	},

};



#define NBR_OF_PORTS sizeof(crisv32_ioports)/sizeof(struct crisv32_ioport)

#define NBR_OF_PORTS ARRAY_SIZE(crisv32_ioports)



struct crisv32_iopin crisv32_led_net0_green;

struct crisv32_iopin crisv32_led_net0_red;

arch/cris/arch-v32/mach-fs/io.c

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ struct crisv32_ioport crisv32_ioports[] = { 
	}

};



#define NBR_OF_PORTS sizeof(crisv32_ioports)/sizeof(struct crisv32_ioport)

#define NBR_OF_PORTS ARRAY_SIZE(crisv32_ioports)



struct crisv32_iopin crisv32_led_net0_green;

struct crisv32_iopin crisv32_led_net0_red;