]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
13 years agoAdd support for Aspire 1410 BIOS v1.3314. Fixes the following error:
Clay Carpenter [Tue, 26 Jul 2011 10:14:37 +0000 (20:14 +1000)]
Add support for Aspire 1410 BIOS v1.3314.  Fixes the following error:

acerhdf: unknown (unsupported) BIOS version Acer/Aspire 1410/v1.3314,
please report, aborting!

Signed-off-by: Clay Carpenter <claycarpenter@gmail.com>
Signed-off-by: Peter Feuerer <peter@piie.net>
Cc: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
13 years agoLinux supports some optional features, but it should notify the BIOS about
Shaohua Li [Tue, 26 Jul 2011 10:14:37 +0000 (20:14 +1000)]
Linux supports some optional features, but it should notify the BIOS about
them via the _OSI method.  Currently Linux doesn't notify any, which might
make such features not work because the BIOS doesn't know about them.

Jarosz has a system which needs this to make ACPI processor aggregator
device work.

Reported-by: "Jarosz, Sebastian" <sebastian.jarosz@intel.com>
Signed-off-by: Shaohua Li <shaohua.li@intel.com>
Acked-by: Matthew Garrett <mjg@redhat.com>
Cc: Len Brown <lenb@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
13 years agob552a8c56db8 ("ACPI: remove NID_INVAL") removed the left over uses of
David Rientjes [Tue, 26 Jul 2011 10:14:37 +0000 (20:14 +1000)]
b552a8c56db8 ("ACPI: remove NID_INVAL") removed the left over uses of
NID_INVAL, but didn't actually remove the definition.  Remove it.

Signed-off-by: David Rientjes <rientjes@google.com>
Cc: Len Brown <lenb@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
13 years agoTHERMAL_HWMON is implemented inside the thermal_sys driver and has no
Jean Delvare [Tue, 26 Jul 2011 10:14:36 +0000 (20:14 +1000)]
THERMAL_HWMON is implemented inside the thermal_sys driver and has no
effect on drivers implementing thermal zones, so they shouldn't see
anything related to it in <linux/thermal.h>.  Making the THERMAL_HWMON
implementation fully internal has two advantages beyond the cleaner
design:

* This avoids rebuilding all thermal drivers if the THERMAL_HWMON
  implementation changes, or if CONFIG_THERMAL_HWMON gets enabled or
  disabled.

* This avoids breaking the thermal kABI in these cases too, which should
  make distributions happy.

The only drawback I can see is slightly higher memory fragmentation, as
the number of kzalloc() calls will increase by one per thermal zone.  But
I doubt it will be a problem in practice, as I've never seen a system with
more than two thermal zones.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Rene Herman <rene.herman@gmail.com>
Cc: Len Brown <len.brown@intel.com>
Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
13 years agoWe'll soon need to reuse it.
Jean Delvare [Tue, 26 Jul 2011 10:14:36 +0000 (20:14 +1000)]
We'll soon need to reuse it.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Rene Herman <rene.herman@gmail.com>
Cc: Len Brown <len.brown@intel.com>
Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
13 years agoIt's about time to revert 16d752397301b9 ("thermal: Create
Jean Delvare [Tue, 26 Jul 2011 10:14:36 +0000 (20:14 +1000)]
It's about time to revert 16d752397301b9 ("thermal: Create
CONFIG_THERMAL_HWMON=n").  Anybody running a kernel >= 2.6.40 would also
be running a recent enough version of lm-sensors.

Actually having CONFIG_THERMAL_HWMON is pretty convenient so instead of
dropping it, we keep it but hide it.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Rene Herman <rene.herman@gmail.com>
Cc: Len Brown <len.brown@intel.com>
Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
13 years agokernel/time.c:578: error: conflicting types for 'jiffies_to_clock_t'
Andrew Morton [Tue, 26 Jul 2011 10:14:36 +0000 (20:14 +1000)]
kernel/time.c:578: error: conflicting types for 'jiffies_to_clock_t'
include/linux/jiffies.h:306: note: previous declaration of 'jiffies_to_clock_t' was here

Cc: John Stultz <john.stultz@linaro.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: hank <pyu@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
13 years agoThe parameter's origin type is long. On an i386 architecture, it can
hank [Tue, 26 Jul 2011 10:14:35 +0000 (20:14 +1000)]
The parameter's origin type is long.  On an i386 architecture, it can
easily be larger than 0x80000000, causing this function to convert it to a
sign-extended u64 type.  Change the type to unsigned long so we get the
correct result.

Signed-off-by: hank <pyu@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: John Stultz <john.stultz@linaro.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
13 years agoMy load tests on PowerPC freeze within minutes in __slab_free(). I
Hugh Dickins [Tue, 26 Jul 2011 10:14:35 +0000 (20:14 +1000)]
My load tests on PowerPC freeze within minutes in __slab_free().  I
happened to try PPC first, didn't try without this fix on x86.

It looks as if the author was interrupted while devising the new
cmpxchg_double_slab() version of __slab_free(): its decision to
spin_lock_irqsave() depends on several uninitialized fields, and fixing
that (by copying page to new) mostly fixes it.

But I didn't think about it very much, and this may well not be what the
author intends; and I have seen a couple of much rarer freezes in
__slab_free() on PPC (not yet on x86) even after applying this.

Signed-off-by: Hugh Dickins <hughd@google.com>
Cc: Pekka Enberg <penberg@cs.helsinki.fi>
Cc: Christoph Lameter <cl@linux.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
13 years agoarch/cris/arch-v10/kernel/irq.c:239: error: implicit declaration of function 'kgdb_init'
WANG Cong [Tue, 26 Jul 2011 10:14:34 +0000 (20:14 +1000)]
arch/cris/arch-v10/kernel/irq.c:239: error: implicit declaration of function 'kgdb_init'
arch/cris/arch-v10/kernel/irq.c:240: error: implicit declaration of function 'breakpoint'

Declare these two functions.

Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
13 years agoarch/cris/arch-v10/drivers/sync_serial.c:961: error: conflicting types for 'sync_seri...
WANG Cong [Tue, 26 Jul 2011 10:14:34 +0000 (20:14 +1000)]
arch/cris/arch-v10/drivers/sync_serial.c:961: error: conflicting types for 'sync_serial_ioctl'

Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
13 years agoarch/cris/arch-v10/drivers/sync_serial.c:628: error: 'ret' undeclared (first use...
WANG Cong [Tue, 26 Jul 2011 10:14:33 +0000 (20:14 +1000)]
arch/cris/arch-v10/drivers/sync_serial.c:628: error: 'ret' undeclared (first use in this function)

'ret' should be 'err'.

Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
13 years agoWARNING: line over 80 characters
Andrew Morton [Tue, 26 Jul 2011 10:14:33 +0000 (20:14 +1000)]
WARNING: line over 80 characters
#37: FILE: arch/cris/include/asm/thread_info.h:70:
+#define alloc_thread_info_node(tsk, node) ((struct thread_info *) __get_free_pages(GFP_KERNEL,1))

ERROR: space required after that ',' (ctx:VxV)
#37: FILE: arch/cris/include/asm/thread_info.h:70:
+#define alloc_thread_info_node(tsk, node) ((struct thread_info *) __get_free_pages(GFP_KERNEL,1))
                                                                                              ^

total: 1 errors, 1 warnings, 18 lines checked

./patches/cris-fix-a-build-error-in-kernel-forkc.patch has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.

Please run checkpatch prior to sending patches

Cc: WANG Cong <xiyou.wangcong@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
13 years agokernel/fork.c:267: error: implicit declaration of function
WANG Cong [Tue, 26 Jul 2011 10:14:33 +0000 (20:14 +1000)]
kernel/fork.c:267: error: implicit declaration of function
'alloc_thread_info_node'

This is due to renaming alloc_thread_info() to alloc_thread_info_node().

Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
13 years agoMerge remote-tracking branch 'moduleh/module.h-split'
Stephen Rothwell [Mon, 1 Aug 2011 03:08:55 +0000 (13:08 +1000)]
Merge remote-tracking branch 'moduleh/module.h-split'

Conflicts:
drivers/dma/ste_dma40.c

13 years agoMerge remote-tracking branch 'tmem/linux-next'
Stephen Rothwell [Mon, 1 Aug 2011 02:55:12 +0000 (12:55 +1000)]
Merge remote-tracking branch 'tmem/linux-next'

13 years agoMerge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Mon, 1 Aug 2011 02:53:43 +0000 (12:53 +1000)]
Merge remote-tracking branch 'regmap/for-next'

13 years agoMerge remote-tracking branch 'namespace/master'
Stephen Rothwell [Mon, 1 Aug 2011 02:52:24 +0000 (12:52 +1000)]
Merge remote-tracking branch 'namespace/master'

13 years agoMerge remote-tracking branch 'sysctl/master'
Stephen Rothwell [Mon, 1 Aug 2011 02:51:05 +0000 (12:51 +1000)]
Merge remote-tracking branch 'sysctl/master'

13 years agoMerge remote-tracking branch 'drivers-x86/linux-next'
Stephen Rothwell [Mon, 1 Aug 2011 02:49:24 +0000 (12:49 +1000)]
Merge remote-tracking branch 'drivers-x86/linux-next'

Conflicts:
Documentation/feature-removal-schedule.txt

13 years agoMerge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Mon, 1 Aug 2011 02:48:30 +0000 (12:48 +1000)]
Merge remote-tracking branch 'tip/auto-latest'

13 years agoMerge remote-tracking branch 'i7300_edac/linux_next'
Stephen Rothwell [Mon, 1 Aug 2011 02:48:20 +0000 (12:48 +1000)]
Merge remote-tracking branch 'i7300_edac/linux_next'

13 years agoMerge remote-tracking branch 'i7core_edac/linux_next'
Stephen Rothwell [Mon, 1 Aug 2011 02:46:49 +0000 (12:46 +1000)]
Merge remote-tracking branch 'i7core_edac/linux_next'

13 years agoMerge remote-tracking branch 'fsnotify/for-next'
Stephen Rothwell [Mon, 1 Aug 2011 02:44:12 +0000 (12:44 +1000)]
Merge remote-tracking branch 'fsnotify/for-next'

13 years agoMerge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Mon, 1 Aug 2011 02:42:46 +0000 (12:42 +1000)]
Merge remote-tracking branch 'trivial/for-next'

13 years agoMerge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Mon, 1 Aug 2011 02:41:09 +0000 (12:41 +1000)]
Merge remote-tracking branch 'watchdog/master'

13 years agoMerge remote-tracking branch 'agp/agp-next'
Stephen Rothwell [Mon, 1 Aug 2011 02:40:42 +0000 (12:40 +1000)]
Merge remote-tracking branch 'agp/agp-next'

13 years agoMerge remote-tracking branch 'voltage/for-next'
Stephen Rothwell [Mon, 1 Aug 2011 02:39:08 +0000 (12:39 +1000)]
Merge remote-tracking branch 'voltage/for-next'

13 years agoMerge remote-tracking branch 'fbdev/master'
Stephen Rothwell [Mon, 1 Aug 2011 02:37:39 +0000 (12:37 +1000)]
Merge remote-tracking branch 'fbdev/master'

13 years agoMerge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Mon, 1 Aug 2011 02:37:21 +0000 (12:37 +1000)]
Merge remote-tracking branch 'slab/for-next'

13 years agoMerge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Mon, 1 Aug 2011 02:36:03 +0000 (12:36 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'

13 years agoMerge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Mon, 1 Aug 2011 02:34:41 +0000 (12:34 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'

13 years agoMerge remote-tracking branch 'leds/for-mm'
Stephen Rothwell [Mon, 1 Aug 2011 02:34:34 +0000 (12:34 +1000)]
Merge remote-tracking branch 'leds/for-mm'

Conflicts:
drivers/leds/Kconfig

13 years agoMerge branch 'quilt/device-mapper'
Stephen Rothwell [Mon, 1 Aug 2011 02:32:31 +0000 (12:32 +1000)]
Merge branch 'quilt/device-mapper'

13 years agoMerge remote-tracking branch 'block/for-next'
Stephen Rothwell [Mon, 1 Aug 2011 02:28:21 +0000 (12:28 +1000)]
Merge remote-tracking branch 'block/for-next'

13 years agoMerge branch 'quilt/rr'
Stephen Rothwell [Mon, 1 Aug 2011 02:26:56 +0000 (12:26 +1000)]
Merge branch 'quilt/rr'

13 years agoMerge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Mon, 1 Aug 2011 02:25:36 +0000 (12:25 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'

13 years agoMerge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Mon, 1 Aug 2011 02:24:05 +0000 (12:24 +1000)]
Merge remote-tracking branch 'sound/for-next'

13 years agoMerge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Mon, 1 Aug 2011 02:22:33 +0000 (12:22 +1000)]
Merge remote-tracking branch 'l2-mtd/master'

Conflicts:
drivers/mtd/maps/lantiq-flash.c
drivers/mtd/maps/pxa2xx-flash.c

13 years agoMerge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Mon, 1 Aug 2011 02:21:10 +0000 (12:21 +1000)]
Merge remote-tracking branch 'bluetooth/master'

13 years agoMerge remote-tracking branch 'async_tx/next'
Stephen Rothwell [Mon, 1 Aug 2011 02:18:10 +0000 (12:18 +1000)]
Merge remote-tracking branch 'async_tx/next'

13 years agoMerge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Mon, 1 Aug 2011 02:16:44 +0000 (12:16 +1000)]
Merge remote-tracking branch 'slave-dma/next'

Conflicts:
drivers/dma/mv_xor.c

13 years agoMerge remote-tracking branch 'iscsi-target/for-next'
Stephen Rothwell [Mon, 1 Aug 2011 02:15:17 +0000 (12:15 +1000)]
Merge remote-tracking branch 'iscsi-target/for-next'

13 years agoMerge remote-tracking branch 'ibft/master'
Stephen Rothwell [Mon, 1 Aug 2011 02:15:12 +0000 (12:15 +1000)]
Merge remote-tracking branch 'ibft/master'

13 years agoMerge remote-tracking branch 'swiotlb/master'
Stephen Rothwell [Mon, 1 Aug 2011 02:15:06 +0000 (12:15 +1000)]
Merge remote-tracking branch 'swiotlb/master'

13 years agoMerge remote-tracking branch 'powertools/tools-test'
Stephen Rothwell [Mon, 1 Aug 2011 02:13:40 +0000 (12:13 +1000)]
Merge remote-tracking branch 'powertools/tools-test'

13 years agoMerge remote-tracking branch 'idle-test/idle-test'
Stephen Rothwell [Mon, 1 Aug 2011 02:12:22 +0000 (12:12 +1000)]
Merge remote-tracking branch 'idle-test/idle-test'

13 years agoMerge remote-tracking branch 'acpi/test'
Stephen Rothwell [Mon, 1 Aug 2011 02:06:00 +0000 (12:06 +1000)]
Merge remote-tracking branch 'acpi/test'

Conflicts:
arch/ia64/Kconfig
arch/powerpc/Kconfig
arch/x86/Kconfig
lib/Kconfig
lib/Makefile

13 years agoMerge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Mon, 1 Aug 2011 02:05:48 +0000 (12:05 +1000)]
Merge remote-tracking branch 'kconfig/for-next'

13 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Mon, 1 Aug 2011 02:05:38 +0000 (12:05 +1000)]
Merge remote-tracking branch 'kbuild/for-next'

13 years agoMerge branch 'quilt/kernel-doc'
Stephen Rothwell [Mon, 1 Aug 2011 02:04:18 +0000 (12:04 +1000)]
Merge branch 'quilt/kernel-doc'

13 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Mon, 1 Aug 2011 02:04:05 +0000 (12:04 +1000)]
Merge remote-tracking branch 'hid/for-next'

13 years agoMerge remote-tracking branch 'vfs/for-next'
Stephen Rothwell [Mon, 1 Aug 2011 02:03:57 +0000 (12:03 +1000)]
Merge remote-tracking branch 'vfs/for-next'

13 years agoMerge remote-tracking branch 'xfs/master'
Stephen Rothwell [Mon, 1 Aug 2011 02:02:30 +0000 (12:02 +1000)]
Merge remote-tracking branch 'xfs/master'

13 years agoMerge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Mon, 1 Aug 2011 02:00:58 +0000 (12:00 +1000)]
Merge remote-tracking branch 'ocfs2/linux-next'

13 years agoMerge remote-tracking branch 'logfs/master'
Stephen Rothwell [Mon, 1 Aug 2011 02:00:49 +0000 (12:00 +1000)]
Merge remote-tracking branch 'logfs/master'

Conflicts:
fs/logfs/logfs.h

13 years agoMerge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Mon, 1 Aug 2011 01:59:12 +0000 (11:59 +1000)]
Merge remote-tracking branch 'gfs2/master'

13 years agoMerge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Mon, 1 Aug 2011 01:57:45 +0000 (11:57 +1000)]
Merge remote-tracking branch 'ext4/dev'

Conflicts:
fs/ext4/inode.c

13 years agoMerge remote-tracking branch 'cifs/master'
Stephen Rothwell [Mon, 1 Aug 2011 01:56:20 +0000 (11:56 +1000)]
Merge remote-tracking branch 'cifs/master'

13 years agoMerge remote-tracking branch 'ceph/for-next'
Stephen Rothwell [Mon, 1 Aug 2011 01:56:18 +0000 (11:56 +1000)]
Merge remote-tracking branch 'ceph/for-next'

Conflicts:
fs/ceph/export.c

13 years agoMerge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Mon, 1 Aug 2011 01:54:57 +0000 (11:54 +1000)]
Merge remote-tracking branch 'unicore32/unicore32'

13 years agoMerge remote-tracking branch 'tile/master'
Stephen Rothwell [Mon, 1 Aug 2011 01:53:40 +0000 (11:53 +1000)]
Merge remote-tracking branch 'tile/master'

13 years agoMerge remote-tracking branch 'rmobile/rmobile-latest'
Stephen Rothwell [Mon, 1 Aug 2011 01:52:24 +0000 (11:52 +1000)]
Merge remote-tracking branch 'rmobile/rmobile-latest'

13 years agoMerge remote-tracking branch 'sh/sh-latest'
Stephen Rothwell [Mon, 1 Aug 2011 01:51:01 +0000 (11:51 +1000)]
Merge remote-tracking branch 'sh/sh-latest'

13 years agoMerge remote-tracking branch 's390/features'
Stephen Rothwell [Mon, 1 Aug 2011 01:49:44 +0000 (11:49 +1000)]
Merge remote-tracking branch 's390/features'

13 years agoMerge remote-tracking branch '52xx-and-virtex/powerpc/next'
Stephen Rothwell [Mon, 1 Aug 2011 01:48:22 +0000 (11:48 +1000)]
Merge remote-tracking branch '52xx-and-virtex/powerpc/next'

13 years agoMerge remote-tracking branch 'parisc/for-next'
Stephen Rothwell [Mon, 1 Aug 2011 01:46:58 +0000 (11:46 +1000)]
Merge remote-tracking branch 'parisc/for-next'

13 years agoMerge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Mon, 1 Aug 2011 01:45:33 +0000 (11:45 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'

13 years agoMerge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Mon, 1 Aug 2011 01:45:30 +0000 (11:45 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'

13 years agoMerge remote-tracking branch 'ia64/test'
Stephen Rothwell [Mon, 1 Aug 2011 01:44:03 +0000 (11:44 +1000)]
Merge remote-tracking branch 'ia64/test'

13 years agoMerge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Mon, 1 Aug 2011 01:42:42 +0000 (11:42 +1000)]
Merge remote-tracking branch 'cris/for-next'

13 years agoMerge remote-tracking branch 'ux500-core/ux500-core'
Stephen Rothwell [Mon, 1 Aug 2011 01:42:37 +0000 (11:42 +1000)]
Merge remote-tracking branch 'ux500-core/ux500-core'

13 years agoMerge remote-tracking branch 's5p/for-next'
Stephen Rothwell [Mon, 1 Aug 2011 01:41:20 +0000 (11:41 +1000)]
Merge remote-tracking branch 's5p/for-next'

Conflicts:
arch/arm/mach-exynos4/Kconfig
arch/arm/mach-exynos4/mach-smdkc210.c

13 years agoMerge remote-tracking branch 'msm/for-next'
Stephen Rothwell [Mon, 1 Aug 2011 01:39:50 +0000 (11:39 +1000)]
Merge remote-tracking branch 'msm/for-next'

13 years agoMerge remote-tracking branch 'arm-soc/for-next'
Stephen Rothwell [Mon, 1 Aug 2011 01:39:42 +0000 (11:39 +1000)]
Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
arch/arm/mach-exynos4/pm.c
arch/arm/mach-imx/mm-imx25.c
arch/arm/mach-imx/mm-imx31.c
arch/arm/mach-imx/mm-imx35.c
arch/arm/mach-mx5/mm.c
arch/arm/mach-omap2/cm-regbits-44xx.h

13 years agoMerge remote-tracking branch 'arm-lpae/for-next'
Stephen Rothwell [Mon, 1 Aug 2011 01:35:28 +0000 (11:35 +1000)]
Merge remote-tracking branch 'arm-lpae/for-next'

Conflicts:
arch/arm/include/asm/pgalloc.h
arch/arm/include/asm/pgtable.h
arch/arm/include/asm/proc-fns.h
arch/arm/include/asm/tlb.h
arch/arm/mm/context.c
arch/arm/mm/proc-v7.S

13 years agoMerge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Mon, 1 Aug 2011 01:34:10 +0000 (11:34 +1000)]
Merge remote-tracking branch 'arm/for-next'

13 years agoMerge remote-tracking branch 'devicetree-current/devicetree/merge'
Stephen Rothwell [Mon, 1 Aug 2011 01:32:52 +0000 (11:32 +1000)]
Merge remote-tracking branch 'devicetree-current/devicetree/merge'

13 years agoMerge remote-tracking branch 'fbdev-current/fbdev-fixes-for-linus'
Stephen Rothwell [Mon, 1 Aug 2011 01:32:49 +0000 (11:32 +1000)]
Merge remote-tracking branch 'fbdev-current/fbdev-fixes-for-linus'

13 years agoMerge remote-tracking branch 'input-current/for-linus'
Stephen Rothwell [Mon, 1 Aug 2011 01:32:34 +0000 (11:32 +1000)]
Merge remote-tracking branch 'input-current/for-linus'

13 years agoMerge remote-tracking branch 'net-current/master'
Stephen Rothwell [Mon, 1 Aug 2011 01:32:26 +0000 (11:32 +1000)]
Merge remote-tracking branch 'net-current/master'

13 years agoMerge remote-tracking branch 'sparc-current/master'
Stephen Rothwell [Mon, 1 Aug 2011 01:32:24 +0000 (11:32 +1000)]
Merge remote-tracking branch 'sparc-current/master'

13 years agoarm: fix implicit use of asm/sizes.h in plat-s5p/dev-onenand.c
Paul Gortmaker [Sun, 31 Jul 2011 23:51:07 +0000 (19:51 -0400)]
arm: fix implicit use of asm/sizes.h in plat-s5p/dev-onenand.c

In order to fix this:

  CC      arch/arm/plat-s5p/dev-onenand.o
arch/arm/plat-s5p/dev-onenand.c:25: error: 'SZ_128K' undeclared here (not in a function)
arch/arm/plat-s5p/dev-onenand.c:30: error: 'SZ_8K' undeclared here (not in a function)
make[3]: *** [arch/arm/plat-s5p/dev-onenand.o] Error 1

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
13 years agoarm: add asm/vga.h to mach-footbridge/dc21285.c
Paul Gortmaker [Sun, 31 Jul 2011 23:47:52 +0000 (19:47 -0400)]
arm: add asm/vga.h to mach-footbridge/dc21285.c

In order to fix this:

  CC      arch/arm/mach-footbridge/dc21285.o
arch/arm/mach-footbridge/dc21285.c: In function 'dc21285_preinit':
arch/arm/mach-footbridge/dc21285.c:299: error: 'vga_base' undeclared (first use in this function)
arch/arm/mach-footbridge/dc21285.c:299: error: (Each undeclared identifier is reported only once
arch/arm/mach-footbridge/dc21285.c:299: error: for each function it appears in.)
make[3]: *** [arch/arm/mach-footbridge/dc21285.o] Error 1

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
13 years agoAdd module.h to drivers/leds/leds-ns2.c
Paul Gortmaker [Sun, 31 Jul 2011 23:34:16 +0000 (19:34 -0400)]
Add module.h to drivers/leds/leds-ns2.c

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
13 years agoAdd module.h to drivers/crypto/mv_cesa.c
Paul Gortmaker [Sun, 31 Jul 2011 23:32:52 +0000 (19:32 -0400)]
Add module.h to drivers/crypto/mv_cesa.c

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
13 years agoAdd module.h to drivers/regulator/db8500-prcmu.c
Paul Gortmaker [Sun, 31 Jul 2011 23:28:28 +0000 (19:28 -0400)]
Add module.h to drivers/regulator/db8500-prcmu.c

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
13 years agoAdd module.h to drivers/input/keyboard/nomadik-ske-keypad.c
Paul Gortmaker [Sun, 31 Jul 2011 23:27:48 +0000 (19:27 -0400)]
Add module.h to drivers/input/keyboard/nomadik-ske-keypad.c

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
13 years agoAdd module.h to drivers/spi/spi-s3c24xx.c
Paul Gortmaker [Sun, 31 Jul 2011 23:25:22 +0000 (19:25 -0400)]
Add module.h to drivers/spi/spi-s3c24xx.c

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
13 years agoAdd export.h to /home/paul/git/module.h/linux-2.6.git/arch/sh/kernel/cpu/shmobile...
Paul Gortmaker [Sun, 31 Jul 2011 23:21:28 +0000 (19:21 -0400)]
Add export.h to /home/paul/git/module.h/linux-2.6.git/arch/sh/kernel/cpu/shmobile/cpuidle.c

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
13 years agoAdd export.h to /home/paul/git/module.h/linux-2.6.git/arch/sh/mm/init.c
Paul Gortmaker [Sun, 31 Jul 2011 23:20:02 +0000 (19:20 -0400)]
Add export.h to /home/paul/git/module.h/linux-2.6.git/arch/sh/mm/init.c

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
13 years agoAdd export.h to /home/paul/git/module.h/linux-2.6.git/arch/sh/drivers/pci/pci.c
Paul Gortmaker [Sun, 31 Jul 2011 23:20:02 +0000 (19:20 -0400)]
Add export.h to /home/paul/git/module.h/linux-2.6.git/arch/sh/drivers/pci/pci.c

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
13 years agoAdd module.h to /home/paul/git/module.h/linux-2.6.git/drivers/spi/spi-sh-sci.c
Paul Gortmaker [Sun, 31 Jul 2011 23:18:03 +0000 (19:18 -0400)]
Add module.h to /home/paul/git/module.h/linux-2.6.git/drivers/spi/spi-sh-sci.c

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
13 years agoAdd module.h to /home/paul/git/module.h/linux-2.6.git/drivers/sh/maple/maple.c
Paul Gortmaker [Sun, 31 Jul 2011 23:18:02 +0000 (19:18 -0400)]
Add module.h to /home/paul/git/module.h/linux-2.6.git/drivers/sh/maple/maple.c

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
13 years agoAdd module.h to /home/paul/git/module.h/linux-2.6.git/drivers/i2c/busses/i2c-sh7760.c
Paul Gortmaker [Sun, 31 Jul 2011 23:18:01 +0000 (19:18 -0400)]
Add module.h to /home/paul/git/module.h/linux-2.6.git/drivers/i2c/busses/i2c-sh7760.c

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
13 years agoAdd module.h to arch/arm/mach-pxa/corgi.c
Paul Gortmaker [Sun, 31 Jul 2011 23:11:13 +0000 (19:11 -0400)]
Add module.h to arch/arm/mach-pxa/corgi.c

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
13 years agoAdd export.h to arch/ia64/kernel/dma-mapping.c
Paul Gortmaker [Sun, 31 Jul 2011 23:06:56 +0000 (19:06 -0400)]
Add export.h to arch/ia64/kernel/dma-mapping.c

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
13 years agoarm: fix implicit use of moduleparam in mach-mx31*.c
Paul Gortmaker [Sun, 31 Jul 2011 23:01:27 +0000 (19:01 -0400)]
arm: fix implicit use of moduleparam in mach-mx31*.c

To get the definition of core_param() they need this header.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
13 years agoarm: fix implicit use of hardware.h in ehci-mxc.c
Paul Gortmaker [Sun, 31 Jul 2011 22:56:57 +0000 (18:56 -0400)]
arm: fix implicit use of hardware.h in ehci-mxc.c

To fix this:

drivers/usb/host/ehci-mxc.c: In function 'ehci_mxc_drv_probe':
drivers/usb/host/ehci-mxc.c:175: error: implicit declaration of function 'cpu_is_mx35'
drivers/usb/host/ehci-mxc.c:175: error: implicit declaration of function 'cpu_is_mx25'
drivers/usb/host/ehci-mxc.c:185: error: implicit declaration of function 'cpu_is_mx51'
make[5]: *** [drivers/usb/host/ehci-hcd.o] Error 1

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
13 years agoarm: fix implicit use of page.h in sa1100/jornada720.c
Paul Gortmaker [Sun, 31 Jul 2011 22:38:45 +0000 (18:38 -0400)]
arm: fix implicit use of page.h in sa1100/jornada720.c

To fix this:

arch/arm/mach-sa1100/jornada720.c:278: error: 'PAGE_SHIFT' undeclared here (not in a function)
make[3]: *** [arch/arm/mach-sa1100/jornada720.o] Error 1

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>