A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-28 18:51:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge commit 'origin'

Browse source 
Manual fixup of conflicts on:

	arch/powerpc/include/asm/dcr-regs.h
	drivers/net/ibm_newemac/core.h
This commit is contained in:
Benjamin Herrenschmidt 2008-10-15 11:31:54 +11:00
commit 6dc6472581
5097 changed files with 278566 additions and 138302 deletions
Download patch file Download diff file Expand all files Collapse all files

5
drivers/pnp/Makefile
View file

@ -2,12 +2,15 @@
# Makefile for the Linux Plug-and-Play Support.
#
obj-y := core.o card.o driver.o resource.o manager.o support.o interface.o quirks.o system.o
obj-y := core.o card.o driver.o resource.o manager.o support.o interface.o quirks.o
obj-$(CONFIG_PNPACPI) += pnpacpi/
obj-$(CONFIG_PNPBIOS) += pnpbios/
obj-$(CONFIG_ISAPNP) += isapnp/
# pnp_system_init goes after pnpacpi/pnpbios init
obj-y += system.o
ifeq ($(CONFIG_PNP_DEBUG),y)
EXTRA_CFLAGS += -DDEBUG
endif

2
drivers/pnp/pnpacpi/core.c
View file

@ -268,7 +268,7 @@ static int __init pnpacpi_init(void)
return 0;
}
subsys_initcall(pnpacpi_init);
fs_initcall(pnpacpi_init);
static int __init pnpacpi_setup(char *str)
{

2
drivers/pnp/pnpbios/core.c
View file

@ -571,7 +571,7 @@ static int __init pnpbios_init(void)
return 0;
}
subsys_initcall(pnpbios_init);
fs_initcall(pnpbios_init);
static int __init pnpbios_thread_init(void)
{