diff options
author | Linus Torvalds | 2010-05-21 20:17:05 +0200 |
---|---|---|
committer | Linus Torvalds | 2010-05-21 20:17:05 +0200 |
commit | 79c4581262e225a7c96d88b632b05ab3b5e9a52c (patch) | |
tree | 8ef030c74ab7e0d0df27cf86195f915efd2832f7 /drivers/misc/Makefile | |
parent | Merge branch 'drm-for-2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
parent | powerpc: Remove unused 'protect4gb' boot parameter (diff) | |
download | kernel-qcow2-linux-79c4581262e225a7c96d88b632b05ab3b5e9a52c.tar.gz kernel-qcow2-linux-79c4581262e225a7c96d88b632b05ab3b5e9a52c.tar.xz kernel-qcow2-linux-79c4581262e225a7c96d88b632b05ab3b5e9a52c.zip |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (92 commits)
powerpc: Remove unused 'protect4gb' boot parameter
powerpc: Build-in e1000e for pseries & ppc64_defconfig
powerpc/pseries: Make request_ras_irqs() available to other pseries code
powerpc/numa: Use ibm,architecture-vec-5 to detect form 1 affinity
powerpc/numa: Set a smaller value for RECLAIM_DISTANCE to enable zone reclaim
powerpc: Use smt_snooze_delay=-1 to always busy loop
powerpc: Remove check of ibm,smt-snooze-delay OF property
powerpc/kdump: Fix race in kdump shutdown
powerpc/kexec: Fix race in kexec shutdown
powerpc/kexec: Speedup kexec hash PTE tear down
powerpc/pseries: Add hcall to read 4 ptes at a time in real mode
powerpc: Use more accurate limit for first segment memory allocations
powerpc/kdump: Use chip->shutdown to disable IRQs
powerpc/kdump: CPUs assume the context of the oopsing CPU
powerpc/crashdump: Do not fail on NULL pointer dereferencing
powerpc/eeh: Fix oops when probing in early boot
powerpc/pci: Check devices status property when scanning OF tree
powerpc/vio: Switch VIO Bus PM to use generic helpers
powerpc: Avoid bad relocations in iSeries code
powerpc: Use common cpu_die (fixes SMP+SUSPEND build)
...
Diffstat (limited to 'drivers/misc/Makefile')
-rw-r--r-- | drivers/misc/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index 7b6f7eefdf8d..f12dc3e54402 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -3,7 +3,6 @@ # obj-$(CONFIG_IBM_ASM) += ibmasm/ -obj-$(CONFIG_HDPU_FEATURES) += hdpuftrs/ obj-$(CONFIG_AD525X_DPOT) += ad525x_dpot.o obj-$(CONFIG_ATMEL_PWM) += atmel_pwm.o obj-$(CONFIG_ATMEL_SSC) += atmel-ssc.o |