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

Commit 6ebfc0e2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6:
  sh: Fixup __raw_read_trylock().
  sh: Kill off remaining config.h references.
  sh: Initial gitignore list
  sh: build fixes for defconfigs.
  sh: Kill off more dead headers.
  sh: Set pclk default for SH7705.
  sh: defconfig updates.
parents 1e9abb5b fac99d97

arch/sh/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -377,7 +377,7 @@ config SH_PCLK_FREQ 
	default "50000000" if CPU_SUBTYPE_SH7750 || CPU_SUBTYPE_SH7780

	default "50000000" if CPU_SUBTYPE_SH7750 || CPU_SUBTYPE_SH7780

	default "60000000" if CPU_SUBTYPE_SH7751

	default "60000000" if CPU_SUBTYPE_SH7751

	default "33333333" if CPU_SUBTYPE_SH7300 || CPU_SUBTYPE_SH7770 || \

	default "33333333" if CPU_SUBTYPE_SH7300 || CPU_SUBTYPE_SH7770 || \

			      CPU_SUBTYPE_SH7760

			      CPU_SUBTYPE_SH7760 || CPU_SUBTYPE_SH7705

	default "27000000" if CPU_SUBTYPE_SH73180 || CPU_SUBTYPE_SH7343

	default "27000000" if CPU_SUBTYPE_SH73180 || CPU_SUBTYPE_SH7343

	default "66000000" if CPU_SUBTYPE_SH4_202

	default "66000000" if CPU_SUBTYPE_SH4_202

	help

	help

arch/sh/boards/hp6xx/hp6xx_apm.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -6,7 +6,6 @@ 
 * This program is free software; you can redistribute it and/or

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License.

 * modify it under the terms of the GNU General Public License.

 */

 */

#include <linux/config.h>

#include <linux/module.h>

#include <linux/module.h>

#include <linux/apm_bios.h>

#include <linux/apm_bios.h>

#include <linux/kernel.h>

#include <linux/kernel.h>

arch/sh/boards/hp6xx/pm.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -6,7 +6,6 @@ 
 * This program is free software; you can redistribute it and/or

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License.

 * modify it under the terms of the GNU General Public License.

 */

 */

#include <linux/config.h>

#include <linux/init.h>

#include <linux/init.h>

#include <linux/suspend.h>

#include <linux/suspend.h>

#include <linux/errno.h>

#include <linux/errno.h>

arch/sh/boards/landisk/irq.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -14,8 +14,6 @@ 
 * modified by kogiidena

 * modified by kogiidena

 * 2005.03.03

 * 2005.03.03

 */

 */



#include <linux/config.h>

#include <linux/init.h>

#include <linux/init.h>

#include <linux/irq.h>

#include <linux/irq.h>

#include <asm/io.h>

#include <asm/io.h>
@@ -83,7 +81,7 @@ static struct hw_interrupt_type landisk_irq_type = { 
static void make_landisk_irq(unsigned int irq)

static void make_landisk_irq(unsigned int irq)

{

{

	disable_irq_nosync(irq);

	disable_irq_nosync(irq);

	irq_desc[irq].handler = &landisk_irq_type;

	irq_desc[irq].chip = &landisk_irq_type;

	disable_landisk_irq(irq);

	disable_landisk_irq(irq);

}

}

arch/sh/boards/landisk/landisk_pwb.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -11,8 +11,6 @@ 
 *

 *

 * LED control drive function added by kogiidena

 * LED control drive function added by kogiidena

 */

 */



#include <linux/config.h>

#include <linux/module.h>

#include <linux/module.h>

#include <linux/errno.h>

#include <linux/errno.h>

#include <linux/signal.h>

#include <linux/signal.h>