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

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

Merge tag 'arc-4.6-rc4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc 

Pull ARC fixes from Vineet Gupta:
 - fix Kconfig splat due to pcie rework
 - make ethernet work again on axs103
 - provide fb_pgprotect() for future video driver integration

* tag 'arc-4.6-rc4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
  ARC: [plat-axs103] Enable loop block devices
  Revert "ARC: [plat-axs10x] add Ethernet PHY description in .dts"
  arc: Add our own implementation of fb_pgprotect()
  ARC: Don't source drivers/pci/pcie/Kconfig ourselves
parents bf162006 0dee6c82

arch/arc/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -593,7 +593,6 @@ config PCI_SYSCALL 
	def_bool PCI



source "drivers/pci/Kconfig"

source "drivers/pci/pcie/Kconfig"



endmenu

arch/arc/boot/dts/axs10x_mb.dtsi

+0 −8
Original line number Diff line number Diff line
@@ -47,14 +47,6 @@ 
			clocks = <&apbclk>;

			clock-names = "stmmaceth";

			max-speed = <100>;

			mdio0 {

				#address-cells = <1>;

				#size-cells = <0>;

				compatible = "snps,dwmac-mdio";

				phy1: ethernet-phy@1 {

					reg = <1>;

				};

			};

		};



		ehci@0x40000 {

arch/arc/configs/axs103_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ CONFIG_DEVTMPFS=y 
# CONFIG_STANDALONE is not set

# CONFIG_PREVENT_FIRMWARE_BUILD is not set

# CONFIG_FIRMWARE_IN_KERNEL is not set

CONFIG_BLK_DEV_LOOP=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_NETDEVICES=y

arch/arc/configs/axs103_smp_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ CONFIG_DEVTMPFS=y 
# CONFIG_STANDALONE is not set

# CONFIG_PREVENT_FIRMWARE_BUILD is not set

# CONFIG_FIRMWARE_IN_KERNEL is not set

CONFIG_BLK_DEV_LOOP=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_NETDEVICES=y

arch/arc/include/asm/fb.h

0 → 100644
+19 −0
Original line number Diff line number Diff line 
#ifndef _ASM_FB_H_

#define _ASM_FB_H_



#include <linux/fb.h>

#include <linux/fs.h>

#include <asm/page.h>



static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,

				unsigned long off)

{

	vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);

}



static inline int fb_is_primary_device(struct fb_info *info)

{

	return 0;

}



#endif /* _ASM_FB_H_ */