TononixOS/ubports_kernel_google_msm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6

Browse Source 
* 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6: (63 commits)
  of/platform: Register of_platform_drivers with an "of:" prefix
  of/address: Clean up function declarations
  of/spi: call of_register_spi_devices() from spi core code
  of: Provide default of_node_to_nid() implementation.
  of/device: Make of_device_make_bus_id() usable by other code.
  of/irq: Fix endian issues in parsing interrupt specifiers
  of: Fix phandle endian issues
  of/flattree: fix of_flat_dt_is_compatible() to match the full compatible string
  of: remove of_default_bus_ids
  of: make of_find_device_by_node generic
  microblaze: remove references to of_device and to_of_device
  sparc: remove references to of_device and to_of_device
  powerpc: remove references to of_device and to_of_device
  of/device: Replace of_device with platform_device in includes and core code
  of/device: Protect against binding of_platform_drivers to non-OF devices
  of: remove asm/of_device.h
  of: remove asm/of_platform.h
  of/platform: remove all of_bus_type and of_platform_bus_type references
  of: Merge of_platform_bus_type with platform_bus_type
  drivercore/of: Add OF style matching to platform bus
  ...

Fix up trivial conflicts in arch/microblaze/kernel/Makefile due to just
some obj-y removals by the devicetree branch, while the microblaze
updates added a new file.
This commit is contained in:
Linus Torvalds
2010-08-05 15:57:35 -07:00
parent c60c6a96b7 7fb8f881c5
commit 03c0c29aff
190 changed files with 2493 additions and 3865 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/input/misc/sparcspkr.c
View File

@@ -353,14 +353,12 @@ static struct of_platform_driver grover_beep_driver = {
static int __init sparcspkr_init(void)
{
int err = of_register_driver(&bbc_beep_driver,
&of_platform_bus_type);
int err = of_register_platform_driver(&bbc_beep_driver);
if (!err) {
err = of_register_driver(&grover_beep_driver,
&of_platform_bus_type);
err = of_register_platform_driver(&grover_beep_driver);
if (err)
of_unregister_driver(&bbc_beep_driver);
of_unregister_platform_driver(&bbc_beep_driver);
}
return err;
@@ -368,8 +366,8 @@ static int __init sparcspkr_init(void)
static void __exit sparcspkr_exit(void)
{
of_unregister_driver(&bbc_beep_driver);
of_unregister_driver(&grover_beep_driver);
of_unregister_platform_driver(&bbc_beep_driver);
of_unregister_platform_driver(&grover_beep_driver);
}
module_init(sparcspkr_init);