01 Apr, 2009
2 commits
-
Let driver depend on HAS_IOMEM to avoid build breakage on s390:
CC drivers/net/ethoc.o
drivers/net/ethoc.c: In function 'ethoc_read':
drivers/net/ethoc.c:221: error: implicit declaration of function 'ioread32'
drivers/net/ethoc.c: In function 'ethoc_write':
drivers/net/ethoc.c:226: error: implicit declaration of function 'iowrite32'
drivers/net/ethoc.c: In function 'ethoc_rx':
drivers/net/ethoc.c:405: error: implicit declaration of function 'memcpy_fromio'
drivers/net/ethoc.c: In function 'ethoc_start_xmit':
drivers/net/ethoc.c:828: error: implicit declaration of function 'memcpy_toio'Signed-off-by: Heiko Carstens
Acked-by: Thierry Reding
Signed-off-by: David S. Miller
30 Mar, 2009
4 commits
-
Added osi_load_firmware() instead of copying same thing twice
Signed-off-by: Jaswinder Singh Rajput
-
Signed-off-by: Jaswinder Singh Rajput
-
Added predef variable in add_mcs() to support predefined mcs data
Signed-off-by: Jaswinder Singh Rajput
-
Signed-off-by: Alexander Beregalov
Signed-off-by: David S. Miller
29 Mar, 2009
33 commits
-
Signed-off-by: David S. Miller
-
Signed-off-by: David S. Miller
-
We can't put 'mdio' until after we've used it in the
fsl_pq_mdio_bus_name() call.Also fix error return values.
Signed-off-by: David S. Miller
-
We can't put 'mdio' until after we've used it in the
fsl_pq_mdio_bus_name() call.Signed-off-by: David S. Miller
-
Allows for the removal of byteswapping in some places and
the removal of HIPQUAD (replaced by %pI4).Signed-off-by: Harvey Harrison
Signed-off-by: David S. Miller -
drivers/net/hamradio/dmascc.c:587: error: 'struct net_device' has no
member named 'set_mac_address'Signed-off-by: Alexander Beregalov
Signed-off-by: David S. Miller -
Signed-off-by: Alexander Beregalov
Signed-off-by: David S. Miller -
* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
i2c-core: Some style cleanups
i2c-piix4: Add support for the Broadcom HT1100 chipset
i2c-piix4: Add support to SB800 SMBus changes
i2c-pca-platform: Use defaults if no platform_data given
i2c-algo-pca: Use timeout for checking the state machine
i2c-algo-pca: Rework waiting for a free bus
i2c-algo-pca: Add PCA9665 support
i2c: Adapt debug macros for KERN_* constants
i2c-davinci: Fix timeout handling
i2c: Adapter timeout is in jiffies
i2c: Set a default timeout value for all adapters
i2c: Add missing KERN_* constants to printks
i2c-algo-pcf: Handle timeout correctly
i2c-algo-pcf: Style cleanups
eeprom/at24: Remove EXPERIMENTAL
i2c-nforce2: Add support for MCP67, MCP73, MCP78S and MCP79
i2c: Clarify which clients are auto-removed
i2c: Let checkpatch shout on users of the legacy model
i2c: Document the different ways to instantiate i2c devices -
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (422 commits)
[ARM] 5435/1: fix compile warning in sanity_check_meminfo()
[ARM] 5434/1: ARM: OMAP: Fix mailbox compile for 24xx
[ARM] pxa: fix the bad assumption that PCMCIA sockets always start with 0
[ARM] pxa: fix Colibri PXA300 and PXA320 LCD backlight pins
imxfb: Fix TFT mode
i.MX21/27: remove ifdef CONFIG_FB_IMX
imxfb: add clock support
mxc: add arch_reset() function
clkdev: add possibility to get a clock based on the device name
i.MX1: remove fb support from mach-imx
[ARM] pxa: build arch/arm/plat-pxa/mfp.c only when PXA3xx or ARCH_MMP defined
Gemini: Add support for Teltonika RUT100
Gemini: gpiolib based GPIO support v2
MAINTAINERS: add myself as Gemini architecture maintainer
ARM: Add Gemini architecture v3
[ARM] OMAP: Fix compile for omap2_init_common_hw()
MAINTAINERS: Add myself as Faraday ARM core variant maintainer
ARM: Add support for FA526 v2
[ARM] acorn,ebsa110,footbridge,integrator,sa1100: Convert asm/io.h to linux/io.h
[ARM] collie: fix two minor formatting nits
... -
* git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-2.6-async-for-30:
fastboot: remove duplicate unpack_to_rootfs()
ide/net: flip the order of SATA and network init
async: remove the temporary (2.6.29) "async is off by default" codeFix up conflicts in init/initramfs.c manually
-
…nux/kernel/git/tip/linux-2.6-tip
* 'percpu-cpumask-x86-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (682 commits)
percpu: fix spurious alignment WARN in legacy SMP percpu allocator
percpu: generalize embedding first chunk setup helper
percpu: more flexibility for @dyn_size of pcpu_setup_first_chunk()
percpu: make x86 addr <-> pcpu ptr conversion macros generic
linker script: define __per_cpu_load on all SMP capable archs
x86: UV: remove uv_flush_tlb_others() WARN_ON
percpu: finer grained locking to break deadlock and allow atomic free
percpu: move fully free chunk reclamation into a work
percpu: move chunk area map extension out of area allocation
percpu: replace pcpu_realloc() with pcpu_mem_alloc() and pcpu_mem_free()
x86, percpu: setup reserved percpu area for x86_64
percpu, module: implement reserved allocation and use it for module percpu variables
percpu: add an indirection ptr for chunk page map access
x86: make embedding percpu allocator return excessive free space
percpu: use negative for auto for pcpu_setup_first_chunk() arguments
percpu: improve first chunk initial area map handling
percpu: cosmetic renames in pcpu_setup_first_chunk()
percpu: clean up percpu constants
x86: un-__init fill_pud/pmd/pte
x86: remove vestigial fix_ioremap prototypes
...Manually merge conflicts in arch/ia64/kernel/irq_ia64.c
-
Some lines over 80.
The printk(KERN_ERR ... ) should be dev_err.
And some blankspace should be deleted.Signed-off-by: Zhenwen Xu
Signed-off-by: Jean Delvare -
Add support for the Broadcom HT1100 LD chipset (SMBus function.)
Signed-off-by: Flavio Leitner
Signed-off-by: Jean Delvare -
Add support for the AMD SB800 Family series of products.
Major changes include the changes to addressing the SMBus registers at different
location from the locations in the previous compatible parts from AMD such as
SB400/SB600/SB700. For SB800, the main features and register definitions of
SMBus and other interfaces are still compatible with the previous products with
the only change being in how to access the internal registers for these blocks.Signed-off-by: Shane Huang
Signed-off-by: Jean Delvare -
Signed-off-by: Wolfram Sang
Signed-off-by: Jean Delvare -
We now timeout also if the state machine does not change within the
given time. For that, the driver-specific completion-functions are
extended to return true or false depending on the timeout. This then
gets checked in the algorithm.Signed-off-by: Wolfram Sang
Signed-off-by: Jean Delvare -
Waiting for a free bus now accepts the timeout value in jiffies and does
proper checking using time_before.Signed-off-by: Wolfram Sang
Signed-off-by: Jean Delvare -
Add support for the PCA9665 I2C controller.
Signed-off-by: Wolfram Sang
Signed-off-by: Jean Delvare -
According to kerneljanitors todo list all printk calls (beginning
a new line) should have an according KERN_* constant.
Those are the changes to the debug macros in the i2c subsystem
to meet this requirement. Also changing no-debug statements
to raw printks again.Signed-off-by: Frank Seidel
Signed-off-by: Jean Delvare
Tested-by: Wolfram Sang -
Properly set the adapter timeout value in jiffies, and then use that
value in the driver, rather than a hard-coded constant.Signed-off-by: Jean Delvare
Tested-by: Troy Kisky
Cc: Kevin Hilman -
i2c_adapter.timeout is in jiffies. Fix all drivers which thought
otherwise. It didn't really matter as long as the value was only used
inside the driver, but soon i2c-core will use it too so it must have
the proper unit.Note: for the i2c-mpc driver, this fixes a bug in polling mode.
Timeout would trigger after 1 jiffy, which is most probably not what
the author wanted.Signed-off-by: Jean Delvare
Cc: Clifford Wolf
Acked-by: Sean MacLennan
Cc: Stefan Roese
Acked-by: Lennert Buytenhek
Cc: Dan Williams
Cc: Grant Likely
Acked-by: Mark A. Greer -
Setting a default timeout value on a per-algo basis doesn't make any
sense. Move the default value setting to i2c-core. Individual adapter
drivers can specify a different (non-zero) value if they wish.Also express the timeout value in a way which results in the same
duration regarless of the value of HZ.Signed-off-by: Jean Delvare
Acked-by: Wolfram Sang -
According to kerneljanitors todo list all printk calls (beginning
a new line) should have an according KERN_* constant.
Those are the missing pieces here for the i2c subsystem.Signed-off-by: Frank Seidel
Signed-off-by: Jean Delvare -
With a postfix decrement these timeouts reach -1 rather than 0, but after the
loop it is tested whether they have become 0.As pointed out by Jean Delvare, the msg_num should be tested before the timeout.
With the current order, you could exit with a timeout error while all the
messages were successfully transferred.Signed-off-by: Roel Kluin
Signed-off-by: Jean Delvare
Acked-by: Eric Brower -
cleanup whitespace, fix comments and remove the unused STUB_I2C.
Signed-off-by: Roel Kluin
Signed-off-by: Jean Delvare
Acked-by: Eric Brower -
This driver has been widely used since inclusion and no problems have
been reported.Signed-off-by: Wolfram Sang
Cc: David Brownell
Signed-off-by: Jean Delvare -
The MCP78S and MCP79 appear to be compatible with the previous nForce
chips as far as the SMBus controller is concerned. The MCP67 and MCP73
were not tested yet but I'd be very surprised if they weren't
compatible too.Signed-off-by: Jean Delvare
Cc: Oleg Ryjkov
Cc: Malcolm Lalkaka
Cc: Zbigniew Luszpinski -
The automatic removal of i2c clients only affects the clients which
were created automatically in the first place. Add a comment saying
that to avoid any confusion.Signed-off-by: Jean Delvare
-
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (119 commits)
[SCSI] scsi_dh_rdac: Retry for NOT_READY check condition
[SCSI] mpt2sas: make global symbols unique
[SCSI] sd: Make revalidate less chatty
[SCSI] sd: Try READ CAPACITY 16 first for SBC-2 devices
[SCSI] sd: Refactor sd_read_capacity()
[SCSI] mpt2sas v00.100.11.15
[SCSI] mpt2sas: add MPT2SAS_MINOR(221) to miscdevice.h
[SCSI] ch: Add scsi type modalias
[SCSI] 3w-9xxx: add power management support
[SCSI] bsg: add linux/types.h include to bsg.h
[SCSI] cxgb3i: fix function descriptions
[SCSI] libiscsi: fix possbile null ptr session command cleanup
[SCSI] iscsi class: remove host no argument from session creation callout
[SCSI] libiscsi: pass session failure a session struct
[SCSI] iscsi lib: remove qdepth param from iscsi host allocation
[SCSI] iscsi lib: have lib create work queue for transmitting IO
[SCSI] iscsi class: fix lock dep warning on logout
[SCSI] libiscsi: don't cap queue depth in iscsi modules
[SCSI] iscsi_tcp: replace scsi_debug/tcp_debug logging with iscsi conn logging
[SCSI] libiscsi_tcp: replace tcp_debug/scsi_debug logging with session/conn logging
... -
Conflicts:
arch/arm/include/asm/elf.h
arch/arm/kernel/module.c -
Conflicts:
sound/soc/pxa/pxa2xx-i2s.c -
this patch flips the order in which sata and network drivers are initialized.
SATA probing takes quite a bit of time, and with the asynchronous infrastructure
other drivers that run after it can execute in parallel. Network drivers do tend
to take some real time talking to the hardware, so running these later is
a good thing (the sata probe then runs concurrent)This saves about 15% of my kernels boot time.
Both Dave and Jeff acked this patch and suggested it should go via the async
tree.Signed-off-by: Arjan van de Ven
Acked-by: David S. Miller
Acked-by: Jeff Garzik
28 Mar, 2009
1 commit