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

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

Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc 

* 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc:
  [POWERPC] Fix Kconfig warning
  [PPC] Fix modpost warning
  [POWERPC] Fix modpost warning
  [POWERPC] Fix Section mismatch warnings
  [POWERPC] QE: fix Kconfig 'select' warning with UCC_FAST
  [POWERPC] 52xx: unbreak lite5200 dts (_pic vs. -pic)
  [PPC] Remove duplicate export of __div64_32.
  [PPC] Fix COMMON symbol warnings
parents a4326635 58da10bb

arch/powerpc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ config GENERIC_BUG 
	depends on BUG



config SYS_SUPPORTS_APM_EMULATION

	default y if PMAC_APM_EMU

	bool



config DEFAULT_UIMAGE

arch/powerpc/boot/dts/lite5200.dts

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ 
			interrupt-controller;

			#interrupt-cells = <3>;

			device_type = "interrupt-controller";

			compatible = "mpc5200_pic";

			compatible = "mpc5200-pic";

			reg = <500 80>;

			built-in;

		};

arch/powerpc/boot/dts/lite5200b.dts

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ 
			interrupt-controller;

			#interrupt-cells = <3>;

			device_type = "interrupt-controller";

			compatible = "mpc5200b-pic\0mpc5200_pic";

			compatible = "mpc5200b-pic\0mpc5200-pic";

			reg = <500 80>;

			built-in;

		};

arch/powerpc/mm/pgtable_32.c

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ void pgd_free(pgd_t *pgd) 
	free_pages((unsigned long)pgd, PGDIR_ORDER);

}



pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)

__init_refok pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)

{

	pte_t *pte;

	extern int mem_init_done;

arch/powerpc/platforms/chrp/pegasos_eth.c

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ static int Enable_SRAM(void) 


/***********/

/***********/

int mv643xx_eth_add_pds(void)

static int __init mv643xx_eth_add_pds(void)

{

	int ret = 0;

	static struct pci_device_id pci_marvell_mv64360[] = {