Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af768c67 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 3943/1: share declaration of struct pxa2xx_udc_mach_info between multiple platforms
  [ARM] Export smp_call_function()
  [ARM] Add PM_LEGACY defaults
parents f5d6c63a aed6fad8

arch/arm/configs/assabet_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -184,6 +184,7 @@ CONFIG_BINFMT_ELF=y 
# Power management options

#

CONFIG_PM=y

# CONFIG_PM_LEGACY is not set

# CONFIG_APM is not set



#

arch/arm/configs/cerfcube_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -194,6 +194,7 @@ CONFIG_BINFMT_ELF=y 
# Power management options

#

CONFIG_PM=y

# CONFIG_PM_LEGACY is not set

# CONFIG_APM is not set



#

arch/arm/configs/corgi_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -208,6 +208,7 @@ CONFIG_BINFMT_MISC=m 
# Power management options

#

CONFIG_PM=y

# CONFIG_PM_LEGACY is not set

CONFIG_APM=y



#

arch/arm/configs/h3600_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -194,6 +194,7 @@ CONFIG_BINFMT_ELF=y 
# Power management options

#

CONFIG_PM=y

# CONFIG_PM_LEGACY is not set

# CONFIG_APM is not set



#

arch/arm/configs/integrator_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -190,6 +190,7 @@ CONFIG_BINFMT_ELF=y 
# Power management options

#

CONFIG_PM=y

# CONFIG_PM_LEGACY is not set

# CONFIG_APM is not set



#