sugar/linux
1
0
Fork 0
Code Activity
222,770 Commits 1 Branch 0 Tags
aeac0e441045974757e901b46719980a98c270a5
Commit Graph

6 Commits

Author SHA1 Message Date
Greg Kroah-Hartman
e4c5bf8e3d Merge 'staging-next' to Linus's tree 
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-10-28 09:44:56 -07:00
Justin P. Mattock
631dd1a885 Update broken web addresses in the kernel. 
The patch below updates broken web addresses in the kernel

Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>
Cc: Maciej W. Rozycki <macro@linux-mips.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Finn Thain <fthain@telegraphics.com.au>
Cc: Randy Dunlap <rdunlap@xenotime.net>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Dimitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Mike Frysinger <vapier.adi@gmail.com>
Acked-by: Ben Pfaff <blp@cs.stanford.edu>
Acked-by: Hans J. Koch <hjk@linutronix.de>
Reviewed-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
 2010-10-18 11:03:14 +02:00
Dan Carpenter
f090386309 Staging: quickstart: acpi_status is unsigned 
acpi_bus_register_driver() returns an int, not acpi_status.  It returns
zero on success and negative error codes on failure, but acpi_status is
unsigned.  We can just use "ret" here.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-08-31 14:48:09 -07:00
Randy Dunlap
57778ef92c Staging: quickstart: depends on INPUT 
quickstart uses input_*() functions so it should depend on INPUT.

ERROR: "input_register_device" [drivers/staging/quickstart/quickstart.ko] undefined!
ERROR: "input_allocate_device" [drivers/staging/quickstart/quickstart.ko] undefined!
ERROR: "input_event" [drivers/staging/quickstart/quickstart.ko] undefined!
ERROR: "input_free_device" [drivers/staging/quickstart/quickstart.ko] undefined!
ERROR: "input_unregister_device" [drivers/staging/quickstart/quickstart.ko] undefined!

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Angelo Arrifano <miknix@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-08-02 18:12:46 -07:00
Greg Kroah-Hartman
8dd1260f93 Staging: quickstart: add the quickstart driver to the build 
This adds the needed Kconfig and Makefile changes to add
the quickstart driver to the build.

Cc: Angelo Arrifano <miknix@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-07-08 16:25:55 -07:00
Angelo Arrifano
6da4cd4690 Staging: add quickstart acpi key driver 
This adds the quickstart acpi key driver to the staging tree

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-07-08 16:22:31 -07:00