summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2008-10-20Add linux-next specific files for 20081020next-20081020Stephen Rothwell
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2008-10-20staging: sxg depends on X86Stephen Rothwell
sxghif.h has code that explicitly will not build fo other architecures. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2008-10-20ibm_newemac: Fix new MAL feature handlingJosh Boyer
On Thu, Oct 16, 2008 at 03:56:50PM +1100, Benjamin Herrenschmidt wrote: >> drivers/net/ibm_newemac/mal.c: In function 'mal_txeob': >> drivers/net/ibm_newemac/mal.c:284: error: implicit declaration of function 'mtdcri' >> drivers/net/ibm_newemac/mal.c:284: error: 'SDR0' undeclared (first use in this function) >> drivers/net/ibm_newemac/mal.c:284: error: (Each undeclared identifier is reported only once >> drivers/net/ibm_newemac/mal.c:284: error: for each function it appears in.) >> drivers/net/ibm_newemac/mal.c:285: error: implicit declaration of function 'mfdcri' >> drivers/net/ibm_newemac/mal.c: In function 'mal_rxeob': >> drivers/net/ibm_newemac/mal.c:302: error: 'SDR0' undeclared (first use in this function) > >That's annoying, I'll have a look. Support for new features needed by the PPC 405EZ boards introduced some errors in the MAL and EMAC feature handling. This broke 'allmodconfig' builds as CONFIG_PPC_DCR_NATIVE is not set for those. This patch fixes these errors by wrapping the code in the appropriate #ifdefs. Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
2008-10-20mfd/wm8350: don't export static functionsStephen Rothwell
Today's linux-next build (powerpc allyesconfig) failed like this: drivers/mfd/wm8350-core.c:1131: error: __ksymtab_wm8350_create_cache causes a section type conflict Caused by commit 89b4012befb1abca5e86d232bc0e2a797b0d9825 ("mfd: Core support for the WM8350 AudioPlus PMIC"). wm8350_create_cache is not used elsewhere, so remove the EXPORT_SYMBOL. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2008-10-20tpm: don't export static functionsStephen Rothwell
Today's linux-next build (powerpc_allyesconfig) failed like this: drivers/char/tpm/tpm.c:1162: error: __ksymtab_tpm_dev_release causes a section type conflict Caused by commit 253115b71fa06330bd58afbe01ccaf763a8a0cf1 ("The tpm_dev_release function is only called for platform devices, not pnp") which exported a static function. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2008-10-20sparc: qlogicpti fallout from sbus removalStephen Rothwell
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2008-10-20Merge commit 'proc/proc'Stephen Rothwell
2008-10-20Merge commit 'watchdog/master'Stephen Rothwell
2008-10-20Merge commit 'uwb/for-upstream'Stephen Rothwell
Conflicts: Documentation/ABI/testing/sysfs-bus-usb drivers/Makefile
2008-10-20Merge commit 'fastboot/auto-fastboot-next'Stephen Rothwell
Conflicts: drivers/md/Kconfig include/linux/init.h init/main.c scripts/bootgraph.pl
2008-10-20Merge commit 'oprofile/auto-oprofile-next'Stephen Rothwell
2008-10-20Merge commit 'creds/next-creds-subsys'Stephen Rothwell
Conflicts: fs/devpts/inode.c fs/namespace.c fs/nfsd/nfs4recover.c include/linux/sched.h kernel/exit.c kernel/fork.c kernel/signal.c net/9p/client.c security/selinux/hooks.c
2008-10-20Revert "8250-oxsemi-mainpine"Stephen Rothwell
This reverts commit fd13cafdcc95c68e9ea3af4ea1d629abeac55638.
2008-10-20Merge branch 'quilt/ttydev'Stephen Rothwell
2008-10-20Merge commit 'voltage/for-linus'Stephen Rothwell
2008-10-20Merge commit 'hdlc/hdlc-next'Stephen Rothwell
2008-10-20Merge commit 'mfd/for-next'Stephen Rothwell
2008-10-20Merge commit 'kmemcheck/auto-kmemcheck-next'Stephen Rothwell
Conflicts: MAINTAINERS init/main.c mm/Makefile mm/slab.c mm/slub.c
2008-10-20Merge commit 'slab/for-next'Stephen Rothwell
2008-10-20Merge commit 'kgdb/kgdb-next'Stephen Rothwell
2008-10-20Merge commit 'backlight/for-mm'Stephen Rothwell
2008-10-20Merge commit 'leds/for-mm'Stephen Rothwell
2008-10-20Merge commit 'battery/master'Stephen Rothwell
2008-10-20Merge commit 'pcmcia/master'Stephen Rothwell
2008-10-20Merge commit 'firmware/master'Stephen Rothwell
Conflicts: drivers/scsi/qlogicpti.c firmware/WHENCE
2008-10-20Merge commit 'ubifs/linux-next'Stephen Rothwell
2008-10-20Merge commit 'trivial/next'Stephen Rothwell
Conflicts: Documentation/edac.txt include/linux/securebits.h
2008-10-20Merge commit 'bkl-removal/bkl-removal'Stephen Rothwell
2008-10-20Merge commit 'semaphore-removal/semaphore-removal'Stephen Rothwell
Conflicts: net/9p/trans_virtio.c
2008-10-20Merge commit 'gfs2/master'Stephen Rothwell
2008-10-20Merge commit 'cifs/master'Stephen Rothwell
2008-10-20Merge branch 'quilt/rr'Stephen Rothwell
Conflicts: drivers/md/md.c kernel/module.c
2008-10-20Merge commit 'v9fs/for-next'Stephen Rothwell
2008-10-20Merge commit 'sound/for-next'Stephen Rothwell
2008-10-20vfs/xfs: fallout from i_vnode changeStephen Rothwell
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2008-10-20Merge commit 'vfs/for-next'Stephen Rothwell
Conflicts: fs/ext4/namei.c
2008-10-20Merge commit 'crypto/master'Stephen Rothwell
2008-10-20Revert "[MTD] [NAND] GPIO NAND flash driver"Stephen Rothwell
This reverts commit aaf7ea20000436df3cbb397ccb734ad1e2e5164d.
2008-10-20Merge commit 'mtd/master'Stephen Rothwell
2008-10-20Merge commit 'async_tx/next'Stephen Rothwell
2008-10-20Merge commit 'ocfs2/linux-next'Stephen Rothwell
2008-10-20Merge commit 'scsi/master'Stephen Rothwell
2008-10-20Merge commit 'kvm/master'Stephen Rothwell
2008-10-20Merge commit 'ubi/linux-next'Stephen Rothwell
2008-10-20Merge commit 'ieee1394/for-next'Stephen Rothwell
2008-10-20Merge commit 'acpi/test'Stephen Rothwell
Conflicts: MAINTAINERS arch/x86/kernel/acpi/boot.c drivers/acpi/Kconfig drivers/acpi/scan.c drivers/pnp/Makefile drivers/pnp/quirks.c
2008-10-20Merge commit 'infiniband/for-next'Stephen Rothwell
2008-10-20Merge commit 'xfs/master'Stephen Rothwell
2008-10-20Merge branch 'quilt/ide'Stephen Rothwell
2008-10-20Merge branch 'quilt/kernel-doc'Stephen Rothwell
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-05 02:50:21 +0000