tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds af768c67 f5d6c63a

+38 -16
+1
arch/arm/configs/assabet_defconfig
··· 184 184 # Power management options 185 185 # 186 186 CONFIG_PM=y 187 + # CONFIG_PM_LEGACY is not set 187 188 # CONFIG_APM is not set 188 189 189 190 #
+1
arch/arm/configs/cerfcube_defconfig
··· 194 194 # Power management options 195 195 # 196 196 CONFIG_PM=y 197 + # CONFIG_PM_LEGACY is not set 197 198 # CONFIG_APM is not set 198 199 199 200 #
+1
arch/arm/configs/corgi_defconfig
··· 208 208 # Power management options 209 209 # 210 210 CONFIG_PM=y 211 + # CONFIG_PM_LEGACY is not set 211 212 CONFIG_APM=y 212 213 213 214 #
+1
arch/arm/configs/h3600_defconfig
··· 194 194 # Power management options 195 195 # 196 196 CONFIG_PM=y 197 + # CONFIG_PM_LEGACY is not set 197 198 # CONFIG_APM is not set 198 199 199 200 #
+1
arch/arm/configs/integrator_defconfig
··· 190 190 # Power management options 191 191 # 192 192 CONFIG_PM=y 193 + # CONFIG_PM_LEGACY is not set 193 194 # CONFIG_APM is not set 194 195 195 196 #
+1
arch/arm/configs/jornada720_defconfig
··· 182 182 # Power management options 183 183 # 184 184 CONFIG_PM=y 185 + # CONFIG_PM_LEGACY is not set 185 186 # CONFIG_APM is not set 186 187 187 188 #
+1
arch/arm/configs/lart_defconfig
··· 180 180 # Power management options 181 181 # 182 182 CONFIG_PM=y 183 + # CONFIG_PM_LEGACY is not set 183 184 CONFIG_APM=m 184 185 185 186 #
+1
arch/arm/configs/neponset_defconfig
··· 190 190 # Power management options 191 191 # 192 192 CONFIG_PM=y 193 + # CONFIG_PM_LEGACY is not set 193 194 CONFIG_APM=y 194 195 195 196 #
+1
arch/arm/configs/simpad_defconfig
··· 180 180 # Power management options 181 181 # 182 182 CONFIG_PM=y 183 + # CONFIG_PM_LEGACY is not set 183 184 CONFIG_APM=y 184 185 185 186 #
+1
arch/arm/configs/spitz_defconfig
··· 207 207 # Power management options 208 208 # 209 209 CONFIG_PM=y 210 + # CONFIG_PM_LEGACY is not set 210 211 CONFIG_APM=y 211 212 212 213 #
+1
arch/arm/kernel/smp.c
··· 451 451 return smp_call_function_on_cpu(func, info, retry, wait, 452 452 cpu_online_map); 453 453 } 454 + EXPORT_SYMBOL_GPL(smp_call_function); 454 455 455 456 void show_ipi_list(struct seq_file *p) 456 457 {
+1 -16
include/asm-arm/arch-pxa/udc.h
··· 4 4 * This supports machine-specific differences in how the PXA2xx 5 5 * USB Device Controller (UDC) is wired. 6 6 * 7 - * It is set in linux/arch/arm/mach-pxa/<machine>.c and used in 8 - * the probe routine of linux/drivers/usb/gadget/pxa2xx_udc.c 9 7 */ 10 - struct pxa2xx_udc_mach_info { 11 - int (*udc_is_connected)(void); /* do we see host? */ 12 - void (*udc_command)(int cmd); 13 - #define PXA2XX_UDC_CMD_CONNECT 0 /* let host see us */ 14 - #define PXA2XX_UDC_CMD_DISCONNECT 1 /* so host won't see us */ 15 - 16 - /* Boards following the design guidelines in the developer's manual, 17 - * with on-chip GPIOs not Lubbock's wierd hardware, can have a sane 18 - * VBUS IRQ and omit the methods above. Store the GPIO number 19 - * here; for GPIO 0, also mask in one of the pxa_gpio_mode() bits. 20 - */ 21 - u16 gpio_vbus; /* high == vbus present */ 22 - u16 gpio_pullup; /* high == pullup activated */ 23 - }; 8 + #include <asm/mach/udc_pxa2xx.h> 24 9 25 10 extern void pxa_set_udc_info(struct pxa2xx_udc_mach_info *info); 26 11
+26
include/asm-arm/mach/udc_pxa2xx.h
··· 1 + /* 2 + * linux/include/asm-arm/mach/udc_pxa2xx.h 3 + * 4 + * This supports machine-specific differences in how the PXA2xx 5 + * USB Device Controller (UDC) is wired. 6 + * 7 + * It is set in linux/arch/arm/mach-pxa/<machine>.c or in 8 + * linux/arch/mach-ixp4xx/<machine>.c and used in 9 + * the probe routine of linux/drivers/usb/gadget/pxa2xx_udc.c 10 + */ 11 + 12 + struct pxa2xx_udc_mach_info { 13 + int (*udc_is_connected)(void); /* do we see host? */ 14 + void (*udc_command)(int cmd); 15 + #define PXA2XX_UDC_CMD_CONNECT 0 /* let host see us */ 16 + #define PXA2XX_UDC_CMD_DISCONNECT 1 /* so host won't see us */ 17 + 18 + /* Boards following the design guidelines in the developer's manual, 19 + * with on-chip GPIOs not Lubbock's wierd hardware, can have a sane 20 + * VBUS IRQ and omit the methods above. Store the GPIO number 21 + * here; for GPIO 0, also mask in one of the pxa_gpio_mode() bits. 22 + */ 23 + u16 gpio_vbus; /* high == vbus present */ 24 + u16 gpio_pullup; /* high == pullup activated */ 25 + }; 26 +