diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-25 16:56:39 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-25 16:56:39 -0400 |
commit | d3ec4844d449cf7af9e749f73ba2052fb7b72fc2 (patch) | |
tree | c515913e85f7e50878c83da2a88bc5a7269d087c /arch/mips/include | |
parent | 0003230e8200699860f0b10af524dc47bf8aecad (diff) | |
parent | df2e301fee3c2c2a87592151397ad7699bb14c37 (diff) |
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: (43 commits)
fs: Merge split strings
treewide: fix potentially dangerous trailing ';' in #defined values/expressions
uwb: Fix misspelling of neighbourhood in comment
net, netfilter: Remove redundant goto in ebt_ulog_packet
trivial: don't touch files that are removed in the staging tree
lib/vsprintf: replace link to Draft by final RFC number
doc: Kconfig: `to be' -> `be'
doc: Kconfig: Typo: square -> squared
doc: Konfig: Documentation/power/{pm => apm-acpi}.txt
drivers/net: static should be at beginning of declaration
drivers/media: static should be at beginning of declaration
drivers/i2c: static should be at beginning of declaration
XTENSA: static should be at beginning of declaration
SH: static should be at beginning of declaration
MIPS: static should be at beginning of declaration
ARM: static should be at beginning of declaration
rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check
Update my e-mail address
PCIe ASPM: forcedly -> forcibly
gma500: push through device driver tree
...
Fix up trivial conflicts:
- arch/arm/mach-ep93xx/dma-m2p.c (deleted)
- drivers/gpio/gpio-ep93xx.c (renamed and context nearby)
- drivers/net/r8169.c (just context changes)
Diffstat (limited to 'arch/mips/include')
-rw-r--r-- | arch/mips/include/asm/floppy.h | 2 | ||||
-rw-r--r-- | arch/mips/include/asm/mach-jz4740/gpio.h | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/arch/mips/include/asm/floppy.h b/arch/mips/include/asm/floppy.h index c5c7c0e6064..4456c9c47e2 100644 --- a/arch/mips/include/asm/floppy.h +++ b/arch/mips/include/asm/floppy.h | |||
@@ -29,7 +29,7 @@ static inline void fd_cacheflush(char * addr, long size) | |||
29 | #define FLOPPY0_TYPE fd_drive_type(0) | 29 | #define FLOPPY0_TYPE fd_drive_type(0) |
30 | #define FLOPPY1_TYPE fd_drive_type(1) | 30 | #define FLOPPY1_TYPE fd_drive_type(1) |
31 | 31 | ||
32 | #define FDC1 fd_getfdaddr1(); | 32 | #define FDC1 fd_getfdaddr1() |
33 | 33 | ||
34 | #define N_FDC 1 /* do you *really* want a second controller? */ | 34 | #define N_FDC 1 /* do you *really* want a second controller? */ |
35 | #define N_DRIVE 8 | 35 | #define N_DRIVE 8 |
diff --git a/arch/mips/include/asm/mach-jz4740/gpio.h b/arch/mips/include/asm/mach-jz4740/gpio.h index 7b74703745b..1a6482ea0bb 100644 --- a/arch/mips/include/asm/mach-jz4740/gpio.h +++ b/arch/mips/include/asm/mach-jz4740/gpio.h | |||
@@ -25,14 +25,13 @@ enum jz_gpio_function { | |||
25 | JZ_GPIO_FUNC3, | 25 | JZ_GPIO_FUNC3, |
26 | }; | 26 | }; |
27 | 27 | ||
28 | |||
29 | /* | 28 | /* |
30 | Usually a driver for a SoC component has to request several gpio pins and | 29 | Usually a driver for a SoC component has to request several gpio pins and |
31 | configure them as funcion pins. | 30 | configure them as funcion pins. |
32 | jz_gpio_bulk_request can be used to ease this process. | 31 | jz_gpio_bulk_request can be used to ease this process. |
33 | Usually one would do something like: | 32 | Usually one would do something like: |
34 | 33 | ||
35 | const static struct jz_gpio_bulk_request i2c_pins[] = { | 34 | static const struct jz_gpio_bulk_request i2c_pins[] = { |
36 | JZ_GPIO_BULK_PIN(I2C_SDA), | 35 | JZ_GPIO_BULK_PIN(I2C_SDA), |
37 | JZ_GPIO_BULK_PIN(I2C_SCK), | 36 | JZ_GPIO_BULK_PIN(I2C_SCK), |
38 | }; | 37 | }; |
@@ -47,8 +46,8 @@ enum jz_gpio_function { | |||
47 | 46 | ||
48 | jz_gpio_bulk_free(i2c_pins, ARRAY_SIZE(i2c_pins)); | 47 | jz_gpio_bulk_free(i2c_pins, ARRAY_SIZE(i2c_pins)); |
49 | 48 | ||
50 | |||
51 | */ | 49 | */ |
50 | |||
52 | struct jz_gpio_bulk_request { | 51 | struct jz_gpio_bulk_request { |
53 | int gpio; | 52 | int gpio; |
54 | const char *name; | 53 | const char *name; |