diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-25 15:52:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-25 15:52:16 -0400 |
| commit | b9fa38f75ea7e1f64bc29653ca9758303ce698e4 (patch) | |
| tree | 6f6c0232ccbd9c27c923cf5cdcb0a3948e061aa9 /drivers/char | |
| parent | 6e18933f2b6156d0a0ec9d5522ab6a6033cf7241 (diff) | |
| parent | f360bf0015e5b3e82be61c68e0863b3f98852ee2 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (49 commits)
[POWERPC] Add zImage.iseries to arch/powerpc/boot/.gitignore
[POWERPC] bootwrapper: fix build error on virtex405-head.S
[POWERPC] 4xx: Fix 460GT support to not enable FPU
[POWERPC] 4xx: Add NOR FLASH entries to Canyonlands and Glacier dts
[POWERPC] Xilinx: of_serial support for Xilinx uart 16550.
[POWERPC] Xilinx: boot support for Xilinx uart 16550.
[POWERPC] celleb: Add support for PCI Express
[POWERPC] celleb: Move miscellaneous files for Beat
[POWERPC] celleb: Move a file for SPU on Beat
[POWERPC] celleb: Move files for Beat mmu and iommu
[POWERPC] celleb: Move files for Beat hvcall interfaces
[POWERPC] celleb: Move the SCC related code for celleb
[POWERPC] celleb: Move the files for celleb base support
[POWERPC] celleb: Consolidate io-workarounds code
[POWERPC] cell: Generalize io-workarounds code
[POWERPC] Add CONFIG_PPC_PSERIES_DEBUG to enable debugging for platforms/pseries
[POWERPC] Convert from DBG() to pr_debug() in platforms/pseries/
[POWERPC] Register udbg console early on pseries LPAR
[POWERPC] Mark udbg console as CON_ANYTIME, ie. callable early in boot
[POWERPC] Set udbg_console index to 0
...
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/xilinx_hwicap/xilinx_hwicap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.c b/drivers/char/xilinx_hwicap/xilinx_hwicap.c index 016f90567a52..dfe6907ae15b 100644 --- a/drivers/char/xilinx_hwicap/xilinx_hwicap.c +++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.c | |||
| @@ -803,7 +803,7 @@ static int __devexit hwicap_of_remove(struct of_device *op) | |||
| 803 | } | 803 | } |
| 804 | 804 | ||
| 805 | /* Match table for of_platform binding */ | 805 | /* Match table for of_platform binding */ |
| 806 | static const struct of_device_id __devinit hwicap_of_match[] = { | 806 | static const struct of_device_id __devinitconst hwicap_of_match[] = { |
| 807 | { .compatible = "xlnx,opb-hwicap-1.00.b", .data = &buffer_icap_config}, | 807 | { .compatible = "xlnx,opb-hwicap-1.00.b", .data = &buffer_icap_config}, |
| 808 | { .compatible = "xlnx,xps-hwicap-1.00.a", .data = &fifo_icap_config}, | 808 | { .compatible = "xlnx,xps-hwicap-1.00.a", .data = &fifo_icap_config}, |
| 809 | {}, | 809 | {}, |