Skip to main content

Browse the archive

https://github.com/torvalds/linux
27 March 2024, 02:37:15 UTC
Revision 3ae86f1a9f2f2bc628ea5ab91dd097a6e6ad210f authored by Linus Torvalds on 28 December 2015, 02:12:21 UTC, committed by Linus Torvalds on 28 December 2015, 02:12:21 UTC 
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
 
Pull MIPS fixes from Ralf Baechle:

 - Fix bitrot in __get_user_unaligned()
 - EVA userspace accessor bug fixes.
 - Fix for build issues with certain toolchains.
 - Fix build error for VDSO with particular toolchain versions.
 - Fix build error due to a variable that should have been removed by an
   earlier patch

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: Fix bitrot in __get_user_unaligned()
  MIPS: Fix build error due to unused variables.
  MIPS: VDSO: Fix build error
  MIPS: CPS: drop .set mips64r2 directives
  MIPS: uaccess: Take EVA into account in [__]clear_user
  MIPS: uaccess: Take EVA into account in __copy_from_user()
  MIPS: uaccess: Fix strlen_user with EVA
2 parent s db06650 + 930c0f7
Raw File
Tip revision: 3ae86f1a9f2f2bc628ea5ab91dd097a6e6ad210f authored by Linus Torvalds on 28 December 2015, 02:12:21 UTC
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Tip revision: 3ae86f1
Makefile 
#
# Makefile for the kernel Parallel port device drivers.
#

parport-objs	:= share.o ieee1284.o ieee1284_ops.o procfs.o

ifeq ($(CONFIG_PARPORT_1284),y)
	parport-objs	+= daisy.o probe.o
endif

obj-$(CONFIG_PARPORT)		+= parport.o
obj-$(CONFIG_PARPORT_PC)	+= parport_pc.o
obj-$(CONFIG_PARPORT_SERIAL)	+= parport_serial.o
obj-$(CONFIG_PARPORT_PC_PCMCIA) += parport_cs.o
obj-$(CONFIG_PARPORT_AMIGA)	+= parport_amiga.o
obj-$(CONFIG_PARPORT_MFC3)	+= parport_mfc3.o
obj-$(CONFIG_PARPORT_ATARI)	+= parport_atari.o
obj-$(CONFIG_PARPORT_SUNBPP)	+= parport_sunbpp.o
obj-$(CONFIG_PARPORT_GSC)	+= parport_gsc.o
obj-$(CONFIG_PARPORT_AX88796)	+= parport_ax88796.o
obj-$(CONFIG_PARPORT_IP32)	+= parport_ip32.o
back to top