2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-20 11:13:58 +08:00
linux-next/arch/m68k/platform/coldfire
Linus Torvalds 7affca3537 Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
* 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (73 commits)
  arm: fix up some samsung merge sysdev conversion problems
  firmware: Fix an oops on reading fw_priv->fw in sysfs loading file
  Drivers:hv: Fix a bug in vmbus_driver_unregister()
  driver core: remove __must_check from device_create_file
  debugfs: add missing #ifdef HAS_IOMEM
  arm: time.h: remove device.h #include
  driver-core: remove sysdev.h usage.
  clockevents: remove sysdev.h
  arm: convert sysdev_class to a regular subsystem
  arm: leds: convert sysdev_class to a regular subsystem
  kobject: remove kset_find_obj_hinted()
  m86k: gpio - convert sysdev_class to a regular subsystem
  mips: txx9_sram - convert sysdev_class to a regular subsystem
  mips: 7segled - convert sysdev_class to a regular subsystem
  sh: dma - convert sysdev_class to a regular subsystem
  sh: intc - convert sysdev_class to a regular subsystem
  power: suspend - convert sysdev_class to a regular subsystem
  power: qe_ic - convert sysdev_class to a regular subsystem
  power: cmm - convert sysdev_class to a regular subsystem
  s390: time - convert sysdev_class to a regular subsystem
  ...

Fix up conflicts with 'struct sysdev' removal from various platform
drivers that got changed:
 - arch/arm/mach-exynos/cpu.c
 - arch/arm/mach-exynos/irq-eint.c
 - arch/arm/mach-s3c64xx/common.c
 - arch/arm/mach-s3c64xx/cpu.c
 - arch/arm/mach-s5p64x0/cpu.c
 - arch/arm/mach-s5pv210/common.c
 - arch/arm/plat-samsung/include/plat/cpu.h
 - arch/powerpc/kernel/sysfs.c
and fix up cpu_is_hotpluggable() as per Greg in include/linux/cpu.h
2012-01-07 12:03:30 -08:00
..
cache.c Fix common misspellings 2011-03-31 11:26:23 -03:00
clk.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
dma_timer.c clocksource: m86k: Convert to clocksource_register_hz/khz 2011-12-24 21:47:56 +10:00
dma.c m68knommu: remove un-needed exporting of COLDFIRE symbols 2011-05-24 10:03:51 +10:00
entry.S m68k: set register a2 to current if MMU enabled on ColdFire 2011-12-30 10:20:24 +10:00
gpio.c m86k: gpio - convert sysdev_class to a regular subsystem 2011-12-21 15:09:54 -08:00
head.S m68k: init the MMU hardware for the 54xx ColdFire 2011-12-30 10:20:23 +10:00
intc-2.c m68knommu: correctly use trap_init 2011-07-25 11:20:41 +10:00
intc-simr.c m68knommu: correctly use trap_init 2011-07-25 11:20:41 +10:00
intc.c m68knommu: correctly use trap_init 2011-07-25 11:20:41 +10:00
Makefile m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
pinmux.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
pit.c clocksource: m86k: Convert to clocksource_register_hz/khz 2011-12-24 21:47:56 +10:00
sltimers.c m68knommu: fix broken ColdFire slice timer read_clk() code 2011-12-24 21:47:58 +10:00
timers.c clocksource: m86k: Convert to clocksource_register_hz/khz 2011-12-24 21:47:56 +10:00
vectors.c m68knommu: correctly use trap_init 2011-07-25 11:20:41 +10:00