Linus Torvalds
60d9aa758c
Merge git://git.infradead.org/mtd-2.6
...
* git://git.infradead.org/mtd-2.6: (90 commits)
jffs2: Fix long-standing bug with symlink garbage collection.
mtd: OneNAND: Fix test of unsigned in onenand_otp_walk()
mtd: cfi_cmdset_0002, fix lock imbalance
Revert "mtd: move mxcnd_remove to .exit.text"
mtd: m25p80: add support for Macronix MX25L4005A
kmsg_dump: fix build for CONFIG_PRINTK=n
mtd: nandsim: add support for 4KiB pages
mtd: mtdoops: refactor as a kmsg_dumper
mtd: mtdoops: make record size configurable
mtd: mtdoops: limit the maximum mtd partition size
mtd: mtdoops: keep track of used/unused pages in an array
mtd: mtdoops: several minor cleanups
core: Add kernel message dumper to call on oopses and panics
mtd: add ARM pismo support
mtd: pxa3xx_nand: Fix PIO data transfer
mtd: nand: fix multi-chip suspend problem
mtd: add support for switching old SST chips into QRY mode
mtd: fix M29W800D dev_id and uaddr
mtd: don't use PF_MEMALLOC
mtd: Add bad block table overrides to Davinci NAND driver
...
Fixed up conflicts (mostly trivial) in
drivers/mtd/devices/m25p80.c
drivers/mtd/maps/pcmciamtd.c
drivers/mtd/nand/pxa3xx_nand.c
kernel/printk.c
2009-12-16 10:23:43 -08:00
Linus Torvalds
4ef58d4e2a
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
...
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (42 commits)
tree-wide: fix misspelling of "definition" in comments
reiserfs: fix misspelling of "journaled"
doc: Fix a typo in slub.txt.
inotify: remove superfluous return code check
hdlc: spelling fix in find_pvc() comment
doc: fix regulator docs cut-and-pasteism
mtd: Fix comment in Kconfig
doc: Fix IRQ chip docs
tree-wide: fix assorted typos all over the place
drivers/ata/libata-sff.c: comment spelling fixes
fix typos/grammos in Documentation/edac.txt
sysctl: add missing comments
fs/debugfs/inode.c: fix comment typos
sgivwfb: Make use of ARRAY_SIZE.
sky2: fix sky2_link_down copy/paste comment error
tree-wide: fix typos "couter" -> "counter"
tree-wide: fix typos "offest" -> "offset"
fix kerneldoc for set_irq_msi()
spidev: fix double "of of" in comment
comment typo fix: sybsystem -> subsystem
...
2009-12-09 19:43:33 -08:00
Adam Buchbinder
6070d81eb5
tree-wide: fix misspelling of "definition" in comments
...
"Definition" is misspelled "defintion" in several comments; this
patch fixes them. No code changes.
Signed-off-by: Adam Buchbinder <adam.buchbinder@gmail.com >
Signed-off-by: Jiri Kosina <jkosina@suse.cz >
2009-12-04 23:41:47 +01:00
André Goddard Rosa
af901ca181
tree-wide: fix assorted typos all over the place
...
That is "success", "unknown", "through", "performance", "[re|un]mapping"
, "access", "default", "reasonable", "[con]currently", "temperature"
, "channel", "[un]used", "application", "example","hierarchy", "therefore"
, "[over|under]flow", "contiguous", "threshold", "enough" and others.
Signed-off-by: André Goddard Rosa <andre.goddard@gmail.com >
Signed-off-by: Jiri Kosina <jkosina@suse.cz >
2009-12-04 15:39:55 +01:00
Leo Chen
1f739d7643
ARM: 5792/1: bcmring: clean up mach/io.h
...
removed old macro definition for io access, using
the generic macros defined in asm/io.h
Signed-off-by: Leo Hao Chen <leochen@broadcom.com >
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk >
2009-12-03 19:42:30 +00:00
Leo (Hao) Chen
266dead216
mtd: add bcmring nand driver
...
Signed-off-by: Leo Hao Chen <leochen@broadcom.com >
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com >
2009-10-20 10:07:23 +09:00
Leo Chen
b623438341
ARM: 5748/1: bcmring: fix build warning messages
...
Fix the warning messages during kernel build for bcmring.
Signed-off-by: Leo Hao Chen <leochen@broadcom.com >
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk >
2009-10-07 13:13:01 +01:00
Leo Chen
a364143127
ARM: 5661/1: bcmring: add csp security hardware headers
...
add csp security hardware headers
Signed-off-by: Leo Chen <leochen@broadcom.com >
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk >
2009-08-15 16:01:49 +01:00
Leo Chen
7ba0902028
ARM: 5660/1: bcmring: add csp timer block header and source files
...
add csp timer block header and source files
Signed-off-by: Leo Chen <leochen@broadcom.com >
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk >
2009-08-15 16:01:48 +01:00
Leo Chen
1a4a561bdd
ARM: 5658/1: bcmring: add csp dmac header files
...
add csp dmac header files
Signed-off-by: Leo Chen <leochen@broadcom.com >
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk >
2009-08-15 16:01:47 +01:00
Leo Chen
4818a4727d
ARM: 5656/1: bcmring: add csp chipc inline functions
...
add csp chipc inline functions
Signed-off-by: Leo Chen <leochen@broadcom.com >
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk >
2009-08-15 16:01:45 +01:00
Leo Chen
2c4b57a204
ARM: 5655/1: bcmring: add csp chipc hardware definition file
...
add csp chipc hardware definition file
Signed-off-by: Leo Chen <leochen@broadcom.com >
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk >
2009-08-15 16:01:45 +01:00
Leo Chen
f1947c7a67
ARM: 5654/1: bcmring: add csp chipc hardware register file
...
add csp chipc hardware register file
Signed-off-by: Leo Chen <leochen@broadcom.com >
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk >
2009-08-15 16:01:44 +01:00
Leo Chen
9133760f4b
ARM: 5652/1: bcmring: add misc headers for csp code
...
add misc wrapper headers for csp code
add ddrc register header file
Signed-off-by: Leo Chen <leochen@broadcom.com >
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk >
2009-08-15 16:01:43 +01:00
Leo Chen
7bab8bfc7f
ARM: 5651/1: bcmring: csp capability header files
...
add mach-bcmring csp capability header files
Signed-off-by: Leo Chen <leochen@broadcom.com >
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk >
2009-08-15 16:01:43 +01:00
Leo Chen
16f5875034
ARM: 5650/1: bcmring: add io.h, uncompress. h, and entry-macro.S
...
add remaining header files in include/mach directory
add entry-macro.S file
Signed-off-by: Leo Chen <leochen@broadcom.com >
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk >
2009-08-15 16:01:42 +01:00
Leo Chen
3455912574
ARM: 5649/1: bcmring: add bcmring timer function
...
bcmring timer helper function, hardware register headers
Signed-off-by: Leo Chen <leochen@broadcom.com >
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk >
2009-08-15 16:01:41 +01:00
Leo Chen
7c4c2951c0
ARM: 5647/1: bcmring: add bcmring dma.h and dma_device.c
...
add bcmring dma.h and dma_device.c
Signed-off-by: Leo Chen <leochen@broadcom.com >
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk >
2009-08-15 16:01:40 +01:00
Leo Chen
661f78d809
ARM: 5646/1: bcmring: add mach-bcmring/mm.c and memory headers
...
memory map addresses
memory map description and init functions
Signed-off-by: Leo Chen <leochen@broadcom.com >
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk >
2009-08-15 16:01:40 +01:00
Leo Chen
b7462d654f
ARM: 5645/1: bcmring: add bcmring irq.c
...
init irq and handler
add irq controller register file and header files
Signed-off-by: Leo Chen <leochen@broadcom.com >
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk >
2009-08-15 16:01:39 +01:00
Leo Chen
278a6752e8
ARM: 5644/1: add bcmring core.c, clock.c, clock.h
...
add core.c, clock.c, and clock.h in mach-bcmring
implement timer init, clocksource init, amba device init
implement clock set/get enable/disable API
add dummy clkdev.h
Signed-off-by: Leo Chen <leochen@broadcom.com >
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk >
2009-08-15 16:01:38 +01:00
Leo Chen
4663712cc7
ARM: 5643/1: bcmring: arch.c and header files
...
add arch.c in mach-bcmring
add related header files in mach-bcmring
Signed-off-by: Leo Chen <leochen@broadcom.com >
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk >
2009-08-15 16:01:38 +01:00