Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

Browse source

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  MIPS: csrc-r4k: Fix declaration depending on the wrong CONFIG_ symbol.
  MIPS: csrc-r4k: Fix spelling mistake.
  MIPS: RB532: Provide functions for gpio configuration
  MIPS: IP22: Make indy_sc_ops variable static
  MIPS: RB532: GPIO register offsets are relative to GPIOBASE
  MIPS: Malta: Fix include paths in malta-amon.c

...

This commit is contained in:

Linus Torvalds 2008-11-20 13:13:48 -08:00

parent e3b4ae79e9 a24e849c01

commit c93fc2873e

8 changed files with 90 additions and 133 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

arch/mips/include/asm/mach-rc32434/gpio.h

View file

14

arch/mips/include/asm/mach-rc32434/rb.h

View file

2

arch/mips/include/asm/time.h

View file

2

arch/mips/kernel/csrc-r4k.c

View file

2

arch/mips/mm/sc-ip22.c

View file

6

arch/mips/mti-malta/malta-amon.c

View file

2

arch/mips/rb532/devices.c

View file

197

arch/mips/rb532/gpio.c

View file