diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2012-01-06 14:42:52 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2012-01-06 14:42:52 -0500 |
commit | ff4b8a57f0aaa2882d444ca44b2b9b333d22a4df (patch) | |
tree | d851c923f85566572112d4c0f884cff388a3cc05 /drivers/mtd/nand | |
parent | 805a6af8dba5dfdd35ec35dc52ec0122400b2610 (diff) | |
parent | ea04018e6bc5ddb2f0466c0e5b986bd4901b7e8e (diff) |
Merge branch 'driver-core-next' into Linux 3.2
This resolves the conflict in the arch/arm/mach-s3c64xx/s3c6400.c file,
and it fixes the build error in the arch/x86/kernel/microcode_core.c
file, that the merge did not catch.
The microcode_core.c patch was provided by Stephen Rothwell
<sfr@canb.auug.org.au> who was invaluable in the merge issues involved
with the large sysdev removal process in the driver-core tree.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/mtd/nand')
-rw-r--r-- | drivers/mtd/nand/alauda.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/mtd/nand/alauda.c b/drivers/mtd/nand/alauda.c index eb40ea829ab2..6a5ff64a139e 100644 --- a/drivers/mtd/nand/alauda.c +++ b/drivers/mtd/nand/alauda.c | |||
@@ -717,17 +717,6 @@ static struct usb_driver alauda_driver = { | |||
717 | .id_table = alauda_table, | 717 | .id_table = alauda_table, |
718 | }; | 718 | }; |
719 | 719 | ||
720 | static int __init alauda_init(void) | 720 | module_usb_driver(alauda_driver); |
721 | { | ||
722 | return usb_register(&alauda_driver); | ||
723 | } | ||
724 | |||
725 | static void __exit alauda_exit(void) | ||
726 | { | ||
727 | usb_deregister(&alauda_driver); | ||
728 | } | ||
729 | |||
730 | module_init(alauda_init); | ||
731 | module_exit(alauda_exit); | ||
732 | 721 | ||
733 | MODULE_LICENSE("GPL"); | 722 | MODULE_LICENSE("GPL"); |