Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (21 commits) gitignore: fix wording mfd: ab8500-debugfs: fix "between" in printk memstick: trivial fix of spelling mistake on management cpupowerutils: bench: fix "average" treewide: Fix typos in printk IB/mlx4: printk fix pinctrl: sirf/atlas7: fix printk spelling serial: mctrl_gpio: Grammar s/lines GPIOs/line GPIOs/, /sets/set/ w1: comment spelling s/minmum/minimum/ Blackfin: comment spelling s/divsor/divisor/ metag: Fix misspellings in comments. ia64: Fix misspellings in comments. hexagon: Fix misspellings in comments. tools/perf: Fix misspellings in comments. cris: Fix misspellings in comments. c6x: Fix misspellings in comments. blackfin: Fix misspelling of 'register' in comment. avr32: Fix misspelling of 'definitions' in comment. treewide: Fix typos in printk Doc: treewide : Fix typos in DocBook/filesystem.xml ...
Dieser Commit ist enthalten in:
@@ -131,7 +131,7 @@ struct ioc3 {
|
||||
#define SSCR_PAUSE_STATE 0x40000000 /* set when PAUSE takes effect*/
|
||||
#define SSCR_RESET 0x80000000 /* reset DMA channels */
|
||||
|
||||
/* all producer/comsumer pointers are the same bitfield */
|
||||
/* all producer/consumer pointers are the same bitfield */
|
||||
#define PROD_CONS_PTR_4K 0x00000ff8 /* for 4K buffers */
|
||||
#define PROD_CONS_PTR_1K 0x000003f8 /* for 1K buffers */
|
||||
#define PROD_CONS_PTR_OFF 3
|
||||
|
@@ -1385,7 +1385,7 @@ typedef union ii_ibcr_u {
|
||||
* respones are captured until IXSS[VALID] is cleared by setting the *
|
||||
* appropriate bit in IECLR. Every time a spurious read response is *
|
||||
* detected, the SPUR_RD bit of the PRB corresponding to the incoming *
|
||||
* message's SIDN field is set. This always happens, regarless of *
|
||||
* message's SIDN field is set. This always happens, regardless of *
|
||||
* whether a header is captured. The programmer should check *
|
||||
* IXSM[SIDN] to determine which widget sent the spurious response, *
|
||||
* because there may be more than one SPUR_RD bit set in the PRB *
|
||||
@@ -2997,7 +2997,7 @@ typedef union ii_ippr_u {
|
||||
/*
|
||||
* Values for field imsgtype
|
||||
*/
|
||||
#define IIO_ICRB_IMSGT_XTALK 0 /* Incoming Meessage from Xtalk */
|
||||
#define IIO_ICRB_IMSGT_XTALK 0 /* Incoming message from Xtalk */
|
||||
#define IIO_ICRB_IMSGT_BTE 1 /* Incoming message from BTE */
|
||||
#define IIO_ICRB_IMSGT_SN1NET 2 /* Incoming message from SN1 net */
|
||||
#define IIO_ICRB_IMSGT_CRB 3 /* Incoming message from CRB ??? */
|
||||
|
@@ -964,7 +964,7 @@ efi_uart_console_only(void)
|
||||
/*
|
||||
* Look for the first granule aligned memory descriptor memory
|
||||
* that is big enough to hold EFI memory map. Make sure this
|
||||
* descriptor is atleast granule sized so it does not get trimmed
|
||||
* descriptor is at least granule sized so it does not get trimmed
|
||||
*/
|
||||
struct kern_memdesc *
|
||||
find_memmap_space (void)
|
||||
|
@@ -11,7 +11,7 @@
|
||||
*
|
||||
* For more details on the theory behind these algorithms, see "IA-64
|
||||
* and Elementary Functions" by Peter Markstein; HP Professional Books
|
||||
* (http://www.hp.com/go/retailbooks/)
|
||||
* (http://www.goodreads.com/book/show/2019887.Ia_64_and_Elementary_Functions)
|
||||
*/
|
||||
|
||||
#include <asm/asmmacro.h>
|
||||
|
@@ -11,7 +11,7 @@
|
||||
*
|
||||
* For more details on the theory behind these algorithms, see "IA-64
|
||||
* and Elementary Functions" by Peter Markstein; HP Professional Books
|
||||
* (http://www.hp.com/go/retailbooks/)
|
||||
* (http://www.goodreads.com/book/show/2019887.Ia_64_and_Elementary_Functions)
|
||||
*/
|
||||
|
||||
#include <asm/asmmacro.h>
|
||||
|
In neuem Issue referenzieren
Einen Benutzer sperren