Merge tag 'arm-soc/for-4.6/soc' of http://github.com/Broadcom/stblinux into next/soc

Browse source

Merge "Broadcom soc changes for 4.6" from Florian Fainelli:

This pull request contains Broadcom ARM-based SoC/platform changes:

- Masahiro updates the Broadcom Northstar Plus SMP operations to be annotated
  with const and __initconst

- Florian removes an unused variable in the Broadcom BCM63XX SMP code

* tag 'arm-soc/for-4.6/soc' of http://github.com/Broadcom/stblinux:
  ARM: BCM63xx: Remove unused pmb_dn variable
  ARM: bcm: use const and __initconst for smp_operations

...

This commit is contained in:

Arnd Bergmann 2016-02-26 23:16:08 +01:00

parent 7410bf1b69 6580566e10

commit e4f61eeb17

2 changed files with 1 additions and 3 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

arch/arm/mach-bcm/bcm63xx_pmb.c

View file

2

arch/arm/mach-bcm/platsmp.c

View file