29 Mar, 2009

1 commit

• ed40d0c47   Merge branch 'origin' into devel ... Browse Code »

  Conflicts:
  sound/soc/pxa/pxa2xx-i2s.c

  Russell King

  2009-03-29 04:29:51 +0800  

25 Mar, 2009

1 commit

• 143a2e54b   [WATCHDOG] More coding-style and trivial clean-up ... Browse Code »

  Some more cleaning-up of the watchdog drivers.

  Signed-off-by: Wim Van Sebroeck

  Wim Van Sebroeck

  2009-03-25 17:07:04 +0800  

09 Mar, 2009

1 commit

• 5bf3df3f0   [ARM] pxa: separate definitions from pxa-regs.h and remove it finally ... Browse Code »

  The remaining registers are separated into:

  -
  -
  -

  and then we can remove pxa-regs.h completely. Instead of #include this
  file, let's:

  1. include the specific with care (if that's absolutely
  necessary)

  2. define the registers in the driver, make cleanly defined API to expose
  the register access to external with sufficient reason

  Signed-off-by: Eric Miao

  Eric Miao

  2009-03-09 21:22:40 +0800  

30 Dec, 2008

1 commit

• 47992cbda   Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/p… ... Browse Code »

  …xa-linux-2.6 into devel

  Russell King

  2008-12-30 02:08:11 +0800  

29 Dec, 2008

1 commit

• 28a623855   [ARM] sa1100_wdt: don't assume CLOCK_TICK_RATE to be a constant ... Browse Code »

  See description of commit:

  [ARM] rtc-sa1100: don't assume CLOCK_TICK_RATE to be a constant

  for additional information.

  Signed-off-by: Eric Miao

  Eric Miao

  2008-12-29 17:58:00 +0800  

30 Nov, 2008

1 commit

• 87c52578b   [ARM] Remove linux/sched.h from asm/cacheflush.h and asm/uaccess.h ... Browse Code »

  ... and fix those drivers that were incorrectly relying upon
  that include.

  Signed-off-by: Russell King

  Russell King

  2008-11-30 02:49:55 +0800  

29 Oct, 2008

1 commit

• 29fa0586d   [PATCH] Switch all my contributions stuff to a single common address ... Browse Code »

  Signed-off-by: Alan Cox
  Signed-off-by: Wim Van Sebroeck

  Alan Cox

  2008-10-29 03:16:11 +0800  

09 Aug, 2008

1 commit

• 097d9eb53   Merge Linus' latest into master ... Browse Code »

  Conflicts:

  drivers/watchdog/at91rm9200_wdt.c
  drivers/watchdog/davinci_wdt.c
  drivers/watchdog/ep93xx_wdt.c
  drivers/watchdog/ixp2000_wdt.c
  drivers/watchdog/ixp4xx_wdt.c
  drivers/watchdog/ks8695_wdt.c
  drivers/watchdog/omap_wdt.c
  drivers/watchdog/pnx4008_wdt.c
  drivers/watchdog/sa1100_wdt.c
  drivers/watchdog/wdt285.c

  Russell King

  2008-08-09 02:18:18 +0800  

07 Aug, 2008

3 commits

• afd2fc02a   Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 ... Browse Code »

  Conflicts:

  arch/arm/mach-pxa/generic.c
  arch/arm/mach-pxa/pxa25x.c
  arch/arm/mach-pxa/pxa27x.c
  arch/arm/mach-pxa/pxa2xx.c
  arch/arm/mach-pxa/pxa3xx.c
  arch/arm/mach-pxa/reset.c
  arch/arm/mach-pxa/spitz.c
  arch/arm/mach-pxa/tosa.c
  drivers/watchdog/sa1100_wdt.c

  Russell King

  2008-08-07 18:06:47 +0800  
• a09e64fbc   [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach ... Browse Code »

  This just leaves include/asm-arm/plat-* to deal with.

  Signed-off-by: Russell King

  Russell King

  2008-08-07 16:55:48 +0800  
• be5097293   [ARM] Remove asm/hardware.h, use asm/arch/hardware.h instead ... Browse Code »

  Remove includes of asm/hardware.h in addition to asm/arch/hardware.h.
  Then, since asm/hardware.h only exists to include asm/arch/hardware.h,
  update everything to directly include asm/arch/hardware.h and remove
  asm/hardware.h.

  Signed-off-by: Russell King

  Russell King

  2008-08-07 16:40:08 +0800  

06 Aug, 2008

1 commit

• 0c06090c9   [WATCHDOG] Coding style - Indentation - part 2 ... Browse Code »

  This brings the watchdog drivers into line with coding style.
  This patch takes cares of the indentation as described in chapter 1.
  Main changes:
  * Re-structure the ioctl switch call for all drivers as follows:
  switch (cmd) {
  case WDIOC_GETSUPPORT:
  case WDIOC_GETSTATUS:
  case WDIOC_GETBOOTSTATUS:
  case WDIOC_GETTEMP:
  case WDIOC_SETOPTIONS:
  case WDIOC_KEEPALIVE:
  case WDIOC_SETTIMEOUT:
  case WDIOC_GETTIMEOUT:
  case WDIOC_GETTIMELEFT:
  default:
  }

  This to make the migration from the drivers to the uniform watchdog
  device driver easier in the future.

  Signed-off-by: Wim Van Sebroeck

  Wim Van Sebroeck

  2008-08-06 21:21:09 +0800  

05 Aug, 2008

1 commit

• 214c6a7ed   [ARM] sa1100_wdt: use reset_status to remember watchdog reset status ... Browse Code »

  Signed-off-by: Eric Miao

  Eric Miao

  2008-08-05 09:26:06 +0800  

21 Jun, 2008

1 commit

• f19e03126   [WATCHDOG 36/57] sa1100_wdt: Switch to unlocked_ioctl ... Browse Code »

  Review and switch to unlocked_ioctl

  Signed-off-by: Alan Cox
  Signed-off-by: Wim Van Sebroeck

  Alan Cox

  2008-06-21 22:22:30 +0800  

20 Oct, 2007

1 commit

• 1977f0327   remove asm/bitops.h includes ... Browse Code »

  remove asm/bitops.h includes

  including asm/bitops directly may cause compile errors. don't include it
  and include linux/bitops instead. next patch will deny including asm header
  directly.

  Cc: Adrian Bunk
  Signed-off-by: Jiri Slaby
  Signed-off-by: Andrew Morton
  Signed-off-by: Linus Torvalds

  Jiri Slaby

  2007-10-20 02:53:41 +0800  

18 Oct, 2007

1 commit

• b7e04f8c6   mv watchdog tree under drivers ... Browse Code »

  move watchdog tree from drivers/char/watchdog to drivers/watchdog.

  Signed-off-by: Wim Van Sebroeck

  Wim Van Sebroeck

  2007-10-18 18:39:03 +0800