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-30 11:41:38 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

Browse source 
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (53 commits)
  Kconfig: acpi: Fix typo in comment.
  misc latin1 to utf8 conversions
  devres: Fix a typo in devm_kfree comment
  btrfs: free-space-cache.c: remove extra semicolon.
  fat: Spelling s/obsolate/obsolete/g
  SCSI, pmcraid: Fix spelling error in a pmcraid_err() call
  tools/power turbostat: update fields in manpage
  mac80211: drop spelling fix
  types.h: fix comment spelling for 'architectures'
  typo fixes: aera -> area, exntension -> extension
  devices.txt: Fix typo of 'VMware'.
  sis900: Fix enum typo 'sis900_rx_bufer_status'
  decompress_bunzip2: remove invalid vi modeline
  treewide: Fix comment and string typo 'bufer'
  hyper-v: Update MAINTAINERS
  treewide: Fix typos in various parts of the kernel, and fix some comments.
  clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR
  gpio: Kconfig: drop unknown symbol 'CS5535_GPIO'
  leds: Kconfig: Fix typo 'D2NET_V2'
  sound: Kconfig: drop unknown symbol ARCH_CLPS7500
  ...

Fix up trivial conflicts in arch/powerpc/platforms/40x/Kconfig (some new
kconfig additions, close to removed commented-out old ones)
This commit is contained in:
Linus Torvalds 2012-01-08 13:21:22 -08:00
commit 98793265b4
176 changed files with 266 additions and 386 deletions
Download patch file Download diff file Expand all files Collapse all files

2
arch/powerpc/include/asm/io.h
View file

@ -394,7 +394,7 @@ __do_out_asm(_rec_outl, "stwbrx")
#endif /* CONFIG_PPC32 */
/* The "__do_*" operations below provide the actual "base" implementation
* for each of the defined acccessor. Some of them use the out_* functions
* for each of the defined accessors. Some of them use the out_* functions
* directly, some of them still use EEH, though we might change that in the
* future. Those macros below provide the necessary argument swapping and
* handling of the IO base for PIO.

2
arch/powerpc/include/asm/keylargo.h
View file

@ -51,7 +51,7 @@
#define KL_GPIO_SOUND_POWER (KEYLARGO_GPIO_0+0x05)
/* Hrm... this one is only to be used on Pismo. It seeem to also
/* Hrm... this one is only to be used on Pismo. It seems to also
* control the timebase enable on other machines. Still to be
* experimented... --BenH.
*/

2
arch/powerpc/mm/numa.c
View file

@ -501,7 +501,7 @@ static int of_get_assoc_arrays(struct device_node *memory,
aa->n_arrays = *prop++;
aa->array_sz = *prop++;
/* Now that we know the number of arrrays and size of each array,
/* Now that we know the number of arrays and size of each array,
* revalidate the size of the property read in.
*/
if (len < (aa->n_arrays * aa->array_sz + 2) * sizeof(unsigned int))

40
arch/powerpc/platforms/40x/Kconfig
View file

@ -1,19 +1,3 @@
#config BUBINGA
# bool "Bubinga"
# depends on 40x
# default n
# select 405EP
# help
# This option enables support for the IBM 405EP evaluation board.
#config CPCI405
# bool "CPCI405"
# depends on 40x
# default n
# select 405GP
# help
# This option enables support for the CPCI405 board.
config ACADIA
bool "Acadia"
depends on 40x
@ -65,14 +49,6 @@ config MAKALU
help
This option enables support for the AMCC PPC405EX board.
#config SYCAMORE
# bool "Sycamore"
# depends on 40x
# default n
# select 405GPR
# help
# This option enables support for the IBM PPC405GPr evaluation board.
config WALNUT
bool "Walnut"
depends on 40x
@ -183,21 +159,6 @@ config IBM405_ERR77
config IBM405_ERR51
bool
#config BIOS_FIXUP
# bool
# depends on BUBINGA || EP405 || SYCAMORE || WALNUT
# default y
#config PPC4xx_DMA
# bool "PPC4xx DMA controller support"
# depends on 4xx
#config PPC4xx_EDMA
# bool
# depends on !STB03xxx && PPC4xx_DMA
# default y
#
config APM8018X
bool "APM8018X"
depends on 40x
@ -206,4 +167,3 @@ config APM8018X
help
This option enables support for the AppliedMicro APM8018X evaluation
board.

18
arch/powerpc/platforms/44x/Kconfig
View file

@ -75,7 +75,7 @@ config KATMAI
select PCI
select PPC4xx_PCI_EXPRESS
select PCI_MSI
select PCC4xx_MSI
select PPC4xx_MSI
help
This option enables support for the AMCC PPC440SPe evaluation board.
@ -207,22 +207,6 @@ config ICON
help
This option enables support for the AMCC PPC440SPe evaluation board.
#config LUAN
# bool "Luan"
# depends on 44x
# default n
# select 440SP
# help
# This option enables support for the IBM PPC440SP evaluation board.
#config OCOTEA
# bool "Ocotea"
# depends on 44x
# default n
# select 440GX
# help
# This option enables support for the IBM PPC440GX evaluation board.
config XILINX_VIRTEX440_GENERIC_BOARD
bool "Generic Xilinx Virtex 5 FXT board support"
depends on 44x

1
arch/powerpc/platforms/512x/Kconfig
View file

@ -12,7 +12,6 @@ config MPC5121_ADS
bool "Freescale MPC5121E ADS"
depends on PPC_MPC512x
select DEFAULT_UIMAGE
select MPC5121_ADS_CPLD
help
This option enables support for the MPC5121E ADS board.