diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-17 20:09:29 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-17 20:09:29 -0400 |
| commit | 4b0e976c663e808822adf51274f948e8a4986f06 (patch) | |
| tree | 64ee15cbaafc283248dfac5dc7bccbc65b9159e0 /arch/mips/include/asm/mach-jz4740/platform.h | |
| parent | 19520fc1ee36164808e6f084bd95e8178e2db231 (diff) | |
| parent | 112e75466f63997d0f4c3c13ecf999e36aea692f (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
watchdog: booke_wdt: clean up status messages
watchdog: cleanup spaces before tabs
watchdog: convert to DEFINE_PCI_DEVICE_TABLE
watchdog: Xen watchdog driver
watchdog: Intel SCU Watchdog Timer Driver for Moorestown and Medfield platforms.
watchdog: jz4740_wdt - fix magic character checking
watchdog: add JZ4740 watchdog driver
watchdog: it87_wdt: Add support for IT8721F watchdog
watchdog: hpwdt: build hpwdt as module by default with NMI_DECODING enabled
watchdog: hpwdt: Fix a couple of typos
Diffstat (limited to 'arch/mips/include/asm/mach-jz4740/platform.h')
| -rw-r--r-- | arch/mips/include/asm/mach-jz4740/platform.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/include/asm/mach-jz4740/platform.h b/arch/mips/include/asm/mach-jz4740/platform.h index 8987a76e9676..564ab81d6cdc 100644 --- a/arch/mips/include/asm/mach-jz4740/platform.h +++ b/arch/mips/include/asm/mach-jz4740/platform.h | |||
| @@ -30,6 +30,7 @@ extern struct platform_device jz4740_i2s_device; | |||
| 30 | extern struct platform_device jz4740_pcm_device; | 30 | extern struct platform_device jz4740_pcm_device; |
| 31 | extern struct platform_device jz4740_codec_device; | 31 | extern struct platform_device jz4740_codec_device; |
| 32 | extern struct platform_device jz4740_adc_device; | 32 | extern struct platform_device jz4740_adc_device; |
| 33 | extern struct platform_device jz4740_wdt_device; | ||
| 33 | 34 | ||
| 34 | void jz4740_serial_device_register(void); | 35 | void jz4740_serial_device_register(void); |
| 35 | 36 | ||