openwrt/staging/blogic.git
19 years ago[PATCH] i2c-viapro: New maintainer
Jean Delvare [Thu, 22 Sep 2005 19:47:58 +0000 (21:47 +0200)]
[PATCH] i2c-viapro: New maintainer

I am taking over the maintenance of the i2c-viapro SMBus driver.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 MAINTAINERS |    6 ++++++
 1 file changed, 6 insertions(+)

19 years ago[PATCH] i2c: Several PEC-related fixes in software SMBus emulation
Hideki Iwamoto [Sun, 25 Sep 2005 15:01:11 +0000 (17:01 +0200)]
[PATCH] i2c: Several PEC-related fixes in software SMBus emulation

Fix several errors in I2C SMBus emulation when PEC is used:
* Weird logic error in SMBus Write Word transactions.
* Wrong buffer size, affecting SMBus Block Write transactions.
* Potential buffer overrun in SMBus Block Write transactions.

From: Hideki Iwamoto <h-iwamoto@kit.hi-ho.ne.jp>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 drivers/i2c/i2c-core.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

19 years ago[PATCH] i2c: Minor i2c-amd8111 cleanup
Jean Delvare [Sun, 25 Sep 2005 14:58:22 +0000 (16:58 +0200)]
[PATCH] i2c: Minor i2c-amd8111 cleanup

I noticed a useless instruction in the i2c-amd8111 driver.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
CC: Vojtech Pavlik <vojtech@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 drivers/i2c/busses/i2c-amd8111.c |    1 -
 1 file changed, 1 deletion(-)

19 years ago[PATCH] i2c: Fix union i2c_smbus_data definition
Hideki Iwamoto [Sun, 25 Sep 2005 14:56:43 +0000 (16:56 +0200)]
[PATCH] i2c: Fix union i2c_smbus_data definition

The i2c_smbus_data union block member has a comment stating that an
extra byte is required for SMBus Block Process Call transactions. This
has been true for three weeks around June 2002, but no more since, so
it is about time that we drop this comment and fix the definition.

From: Hideki Iwamoto <h-iwamoto@kit.hi-ho.ne.jp>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 include/linux/i2c.h |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

19 years ago[PATCH] i2c: Fix I2C_FUNC_PROTOCOL_MANGLING documentation
Hideki Iwamoto [Sun, 25 Sep 2005 14:53:04 +0000 (16:53 +0200)]
[PATCH] i2c: Fix I2C_FUNC_PROTOCOL_MANGLING documentation

Fix the description of I2C_FUNC_PROTOCOL_MANGLING.

From: Hideki Iwamoto <h-iwamoto@kit.hi-ho.ne.jp>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 Documentation/i2c/functionality |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

19 years ago[PATCH] i2c: Adjust i2c_probe() for busses without SMBUS_QUICK
Jean Delvare [Sun, 25 Sep 2005 14:50:06 +0000 (16:50 +0200)]
[PATCH] i2c: Adjust i2c_probe() for busses without SMBUS_QUICK

Move the check for SMBUS_QUICK in i2c_probe() after the forced
addresses have been handled. This makes it possible for a driver to
leave the probed address lists empty, only providing forced addresses,
and get i2c_probe to work even if the bus doesn't support SMBUS_QUICK.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 drivers/i2c/i2c-core.c |   15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

19 years ago[PATCH] hwmon: Minor w83l785ts optimization
Jean Delvare [Sun, 25 Sep 2005 14:45:03 +0000 (16:45 +0200)]
[PATCH] hwmon: Minor w83l785ts optimization

Using s8 instead of u8 to store temperature register values saves a
few instructions on sysfs file read. The very same was done for
several other drivers a while ago (lm63, lm83, lm90...)

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 drivers/hwmon/w83l785ts.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

19 years ago[PATCH] hwmon: w83l785ts converted to dynamic sysfs callbacks
Jean Delvare [Sun, 25 Sep 2005 14:41:18 +0000 (16:41 +0200)]
[PATCH] hwmon: w83l785ts converted to dynamic sysfs callbacks

Convert the w83l785ts driver to use dynamic sysfs callbacks. This is a
small driver so the benefit is thin, but still worth it.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 drivers/hwmon/w83l785ts.c |   36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

19 years ago[PATCH] i2c: Reuse name strings in i2c bus drivers
Jean Delvare [Sun, 25 Sep 2005 14:37:04 +0000 (16:37 +0200)]
[PATCH] i2c: Reuse name strings in i2c bus drivers

Clean up name string usage in 12 i2c bus drivers:
* Use the i2c_adapter name for requesting the I/O region rather than
  redefining a new string.
* Do not initialize the i2c_adapter name to "unset".
This should save a few data bytes here and there.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 drivers/i2c/busses/i2c-ali1535.c |    6 +++---
 drivers/i2c/busses/i2c-ali1563.c |    6 ++++--
 drivers/i2c/busses/i2c-ali15x3.c |    5 +++--
 drivers/i2c/busses/i2c-amd756.c  |    5 ++---
 drivers/i2c/busses/i2c-amd8111.c |    4 +++-
 drivers/i2c/busses/i2c-i801.c    |    4 ++--
 drivers/i2c/busses/i2c-nforce2.c |    4 ++--
 drivers/i2c/busses/i2c-piix4.c   |    4 ++--
 drivers/i2c/busses/i2c-sis5595.c |    5 +++--
 drivers/i2c/busses/i2c-sis630.c  |    6 ++++--
 drivers/i2c/busses/i2c-sis96x.c  |    5 +++--
 drivers/i2c/busses/i2c-via.c     |    4 ++--
 12 files changed, 33 insertions(+), 25 deletions(-)

19 years ago[PATCH] hwmon: Discard bogus comment about init setting limits
Jean Delvare [Sun, 25 Sep 2005 14:29:38 +0000 (16:29 +0200)]
[PATCH] hwmon: Discard bogus comment about init setting limits

Discard a common out-of-date comment in 5 hardware monitoring drivers.
The hardware monitoring chip drivers are no more setting sensor limits
at initialization time, for quite some time already.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 drivers/hwmon/lm78.c     |    1 -
 drivers/hwmon/via686a.c  |    1 -
 drivers/hwmon/w83627hf.c |    1 -
 drivers/hwmon/w83781d.c  |    1 -
 drivers/hwmon/w83792d.c  |    1 -
 5 files changed, 5 deletions(-)

19 years ago[PATCH] hwmon: Discard explicit static initializations to 0
Jean Delvare [Sun, 25 Sep 2005 14:26:44 +0000 (16:26 +0200)]
[PATCH] hwmon: Discard explicit static initializations to 0

Kill explicit static initializations to 0 in 2 hwmon drivers.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 drivers/hwmon/adm1021.c |    2 +-
 drivers/hwmon/via686a.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

19 years ago[PATCH] i2c: Discard explicit static initializations to 0
Jean Delvare [Sun, 25 Sep 2005 14:23:07 +0000 (16:23 +0200)]
[PATCH] i2c: Discard explicit static initializations to 0

Kill explicit static initializations to 0 in 10 i2c drivers.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 drivers/i2c/algos/i2c-algo-pca.c    |    2 +-
 drivers/i2c/algos/i2c-algo-sibyte.c |    2 +-
 drivers/i2c/busses/i2c-ali15x3.c    |    4 ++--
 drivers/i2c/busses/i2c-amd756.c     |    2 +-
 drivers/i2c/busses/i2c-iop3xx.c     |    2 +-
 drivers/i2c/busses/i2c-piix4.c      |    8 ++++----
 drivers/i2c/busses/i2c-sis5595.c    |    4 ++--
 drivers/i2c/busses/i2c-sis630.c     |    2 +-
 drivers/i2c/busses/i2c-sis96x.c     |    2 +-
 drivers/i2c/busses/i2c-via.c        |    2 +-
 10 files changed, 15 insertions(+), 15 deletions(-)

19 years ago[PATCH] hwmon: Do not forcibly enable via686a by default
Jean Delvare [Sun, 25 Sep 2005 14:18:49 +0000 (16:18 +0200)]
[PATCH] hwmon: Do not forcibly enable via686a by default

Do not enable the VIA VT82C686A/B integrated sensors by default, as
disabled sensors usually means that this feature is not used so the
values won't make any sense. This has been confusing many users in the
past:

  http://www2.lm-sensors.nu/~lm78/readticket.cgi?ticket=1786
  http://www2.lm-sensors.nu/~lm78/readticket.cgi?ticket=1811
  http://www2.lm-sensors.nu/~lm78/readticket.cgi?ticket=2052

It is still possible to forcibly enable the sensors by using the
force_addr module parameter.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 Documentation/hwmon/via686a |   17 +++++++++++++++--
 drivers/hwmon/via686a.c     |   18 +++++++++++-------
 2 files changed, 26 insertions(+), 9 deletions(-)

19 years ago[PATCH] hwmon: adm9240 whitespace cleanups
Jean Delvare [Sun, 25 Sep 2005 14:14:18 +0000 (16:14 +0200)]
[PATCH] hwmon: adm9240 whitespace cleanups

This whitespace cleanup patch removes one trailing space and breaks
lines longer than 80 characters.

Signed-off-by: Grant Coady <gcoady@gmail.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 drivers/hwmon/adm9240.c |   33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

19 years ago[PATCH] hwmon: via686a: save 0.5k by long v[256] -> s16 v[256]
Jean Delvare [Sat, 10 Sep 2005 21:00:46 +0000 (23:00 +0200)]
[PATCH] hwmon: via686a: save 0.5k by long v[256] -> s16 v[256]

We can save 0.5kB of data in the via686a driver.

From: Denis Vlasenko <vda@ilport.com.ua>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] hwmon: adm9240 driver update - dynamic sysfs
Grant Coady [Fri, 16 Sep 2005 19:32:57 +0000 (05:32 +1000)]
[PATCH] hwmon: adm9240 driver update - dynamic sysfs

hwmon: adm9240 update 2/2: convert to use dynamic sysfs accessors

This patch converts adm9240 to use Yani Ioannou's dynamic sysfs callbacks,
reducing driver memory footprint from 16312 to 14104 bytes on 2.6.14-rc1,
removing the old driver macro mess.

Run tested on Intel SE440BX-2 mobo.

Signed-off-by: Grant Coady <gcoady@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] hwmon: adm9240 driver update - cleanups
Grant Coady [Fri, 16 Sep 2005 19:32:55 +0000 (05:32 +1000)]
[PATCH] hwmon: adm9240 driver update - cleanups

hwmon: adm9240 update 1/2: cleanups:

o remove i2c read/write wrapper interface as it does nothing,
o change kmalloc + memset to kzalloc

Signed-off-by: Grant Coady <gcoady@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
Linus Torvalds [Fri, 28 Oct 2005 20:09:47 +0000 (13:09 -0700)]
Merge /pub/scm/linux/kernel/git/gregkh/driver-2.6

19 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...
Linus Torvalds [Fri, 28 Oct 2005 19:44:24 +0000 (12:44 -0700)]
Merge branch 'for-linus' of git://git./linux/kernel/git/shaggy/jfs-2.6

19 years ago[MCAST] IPv6: Fix algorithm to compute Querier's Query Interval
Yan Zheng [Fri, 28 Oct 2005 16:02:32 +0000 (00:02 +0800)]
[MCAST] IPv6: Fix algorithm to compute Querier's Query Interval

5.1.3.  Maximum Response Code

   The Maximum Response Code field specifies the maximum time allowed
   before sending a responding Report.  The actual time allowed, called
   the Maximum Response Delay, is represented in units of milliseconds,
   and is derived from the Maximum Response Code as follows:

   If Maximum Response Code < 32768,
      Maximum Response Delay = Maximum Response Code

   If Maximum Response Code >=32768, Maximum Response Code represents a
   floating-point value as follows:

       0 1 2 3 4 5 6 7 8 9 A B C D E F
      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
      |1| exp |          mant         |
      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

   Maximum Response Delay = (mant | 0x1000) << (exp+3)

5.1.9.  QQIC (Querier's Query Interval Code)

   The Querier's Query Interval Code field specifies the [Query
   Interval] used by the Querier.  The actual interval, called the
   Querier's Query Interval (QQI), is represented in units of seconds,
   and is derived from the Querier's Query Interval Code as follows:

   If QQIC < 128, QQI = QQIC

   If QQIC >= 128, QQIC represents a floating-point value as follows:

       0 1 2 3 4 5 6 7
      +-+-+-+-+-+-+-+-+
      |1| exp | mant  |
      +-+-+-+-+-+-+-+-+

   QQI = (mant | 0x10) << (exp + 3)

                                                -- rfc3810

#define MLDV2_QQIC(value) MLDV2_EXP(0x80, 4, 3, value)
#define MLDV2_MRC(value) MLDV2_EXP(0x8000, 12, 3, value)

Above macro are defined in mcast.c. but 1 << 4 == 0x10 and 1 << 12 == 0x1000.
So the result computed by original Macro is larger.

Signed-off-by: Yan Zheng <yanzheng@21cn.com>
Acked-by: David L Stevens <dlstevens@us.ibm.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
19 years ago[IPv4/IPv6]: UFO Scatter-gather approach
Ananda Raju [Tue, 18 Oct 2005 22:46:41 +0000 (15:46 -0700)]
[IPv4/IPv6]: UFO Scatter-gather approach

Attached is kernel patch for UDP Fragmentation Offload (UFO) feature.

1. This patch incorporate the review comments by Jeff Garzik.
2. Renamed USO as UFO (UDP Fragmentation Offload)
3. udp sendfile support with UFO

This patches uses scatter-gather feature of skb to generate large UDP
datagram. Below is a "how-to" on changes required in network device
driver to use the UFO interface.

UDP Fragmentation Offload (UFO) Interface:
-------------------------------------------
UFO is a feature wherein the Linux kernel network stack will offload the
IP fragmentation functionality of large UDP datagram to hardware. This
will reduce the overhead of stack in fragmenting the large UDP datagram to
MTU sized packets

1) Drivers indicate their capability of UFO using
dev->features |= NETIF_F_UFO | NETIF_F_HW_CSUM | NETIF_F_SG

NETIF_F_HW_CSUM is required for UFO over ipv6.

2) UFO packet will be submitted for transmission using driver xmit routine.
UFO packet will have a non-zero value for

"skb_shinfo(skb)->ufo_size"

skb_shinfo(skb)->ufo_size will indicate the length of data part in each IP
fragment going out of the adapter after IP fragmentation by hardware.

skb->data will contain MAC/IP/UDP header and skb_shinfo(skb)->frags[]
contains the data payload. The skb->ip_summed will be set to CHECKSUM_HW
indicating that hardware has to do checksum calculation. Hardware should
compute the UDP checksum of complete datagram and also ip header checksum of
each fragmented IP packet.

For IPV6 the UFO provides the fragment identification-id in
skb_shinfo(skb)->ip6_frag_id. The adapter should use this ID for generating
IPv6 fragments.

Signed-off-by: Ananda Raju <ananda.raju@neterion.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> (forwarded)
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
19 years agoJFS: make sure right-most xtree pages have header.next set to zero
Dave Kleikamp [Fri, 28 Oct 2005 18:27:40 +0000 (13:27 -0500)]
JFS: make sure right-most xtree pages have header.next set to zero

The xtTruncate code was only doing this for leaf pages.  When a file is
horribly fragmented, we may truncate a file leaving an internal page with
an invalid head.next field, which may cause a stale page to be referenced.

Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
19 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
Arnaldo Carvalho de Melo [Fri, 28 Oct 2005 17:49:24 +0000 (15:49 -0200)]
Merge /linux/kernel/git/holtmann/bluetooth-2.6

19 years ago[Bluetooth] Ignore additional interfaces of BPA 100/105 devices
Marcel Holtmann [Fri, 28 Oct 2005 17:20:57 +0000 (19:20 +0200)]
[Bluetooth] Ignore additional interfaces of BPA 100/105 devices

If a BPA 100/105 device contains more then one interface then ignore the
additional interfaces, because they are unused.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
19 years ago[Bluetooth] Update security filter for Extended Inquiry Response
Marcel Holtmann [Fri, 28 Oct 2005 17:20:53 +0000 (19:20 +0200)]
[Bluetooth] Update security filter for Extended Inquiry Response

This patch updates the HCI security filter with support for the Extended
Inquiry Response (EIR) feature.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
19 years ago[Bluetooth] Make more functions static
Marcel Holtmann [Fri, 28 Oct 2005 17:20:48 +0000 (19:20 +0200)]
[Bluetooth] Make more functions static

This patch makes another bunch of functions static.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
19 years ago[Bluetooth] Cleanup of the HCI UART driver
Marcel Holtmann [Fri, 28 Oct 2005 17:20:45 +0000 (19:20 +0200)]
[Bluetooth] Cleanup of the HCI UART driver

This patch contains the big cleanup of the HCI UART driver. The uneeded
header files are removed and their structure declarations are moved into
the protocol implementations.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
19 years ago[Bluetooth] Remove TXCRC compile option for BCSP driver
Marcel Holtmann [Fri, 28 Oct 2005 17:20:40 +0000 (19:20 +0200)]
[Bluetooth] Remove TXCRC compile option for BCSP driver

The TXCRC compile option is not really useful and thus change it
into a module parameter.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
19 years ago[Bluetooth] Move CRC table into RFCOMM core
Marcel Holtmann [Fri, 28 Oct 2005 17:20:36 +0000 (19:20 +0200)]
[Bluetooth] Move CRC table into RFCOMM core

This patch moves rfcomm_crc_table[] into the RFCOMM core, because there
is no need to keep it in a separate file.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
19 years agoMerge ../bleed-2.6
Greg KH [Fri, 28 Oct 2005 17:13:16 +0000 (10:13 -0700)]
Merge ../bleed-2.6

19 years agoMerge branch 'forlinus' of git://parisc-linux.org/home/kyle/git/parisc-2.6
Linus Torvalds [Fri, 28 Oct 2005 17:08:46 +0000 (10:08 -0700)]
Merge branch 'forlinus' of git://parisc-linux.org/home/kyle/git/parisc-2.6

19 years ago[PATCH] Fix documentation of driver suspend/resume callbacks
Takashi Iwai [Fri, 28 Oct 2005 14:45:34 +0000 (16:45 +0200)]
[PATCH] Fix documentation of driver suspend/resume callbacks

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] kernel-doc: drivers/base fixes
Randy Dunlap [Sun, 23 Oct 2005 18:59:14 +0000 (11:59 -0700)]
[PATCH] kernel-doc: drivers/base fixes

driver/base: add missing function parameters; eliminate all warnings.

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] DRIVER MODEL: Get rid of the obsolete tri-level suspend/resume callbacks
Russell King [Fri, 28 Oct 2005 16:52:56 +0000 (09:52 -0700)]
[PATCH] DRIVER MODEL: Get rid of the obsolete tri-level suspend/resume callbacks

In PM v1, all devices were called at SUSPEND_DISABLE level.  Then
all devices were called at SUSPEND_SAVE_STATE level, and finally
SUSPEND_POWER_DOWN level.  However, with PM v2, to maintain
compatibility for platform devices, I arranged for the PM v2
suspend/resume callbacks to call the old PM v1 suspend/resume
callbacks three times with each level in order so that existing
drivers continued to work.

Since this is obsolete infrastructure which is no longer necessary,
we can remove it.  Here's an (untested) patch to do exactly that.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] Driver Core: Big kfree NULL check cleanup - Documentation
Jesper Juhl [Thu, 13 Oct 2005 19:31:08 +0000 (21:31 +0200)]
[PATCH] Driver Core: Big kfree NULL check cleanup - Documentation

This is the Documentation/ part of the big kfree cleanup patch.

Remove pointless checks for NULL prior to calling kfree() in example code in Documentation/.

Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] update required version of udev
Greg Kroah-Hartman [Fri, 28 Oct 2005 05:25:43 +0000 (22:25 -0700)]
[PATCH] update required version of udev

The 071 release is needed to handle the input changes.  Older versions
will work properly with module-based systems, but not for users that
build input stuff into the kernel.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] drivers/base - fix sparse warnings
Ben Dooks [Thu, 13 Oct 2005 16:54:41 +0000 (17:54 +0100)]
[PATCH] drivers/base - fix sparse warnings

There are a number of sparse warnings from the latest sparse
snapshot being generated from the drivers/base build. The
main culprits are due to the initialisation functions not
being declared in a header file.

Also, the firmware.c file should include <linux/device.h>
to get the prototype of  firmware_register() and
firmware_unregister().

This patch moves the init function declerations from the
init.c file to the base.h, and ensures it is included in
all the relevant c sources. It also adds <linux/device.h>
to the included headers for firmware.c.

The patch does not solve all the sparse errors generated,
but reduces the count significantly.

drivers/base/core.c:161:1: warning: symbol 'devices_subsys' was not declared. Should it be static?
drivers/base/core.c:417:12: warning: symbol 'devices_init' was not declared. Should it be static?
drivers/base/sys.c:253:6: warning: symbol 'sysdev_shutdown' was not declared. Should it be static?
drivers/base/sys.c:326:5: warning: symbol 'sysdev_suspend' was not declared. Should it be static?
drivers/base/sys.c:428:5: warning: symbol 'sysdev_resume' was not declared. Should it be static?
drivers/base/sys.c:450:12: warning: symbol 'system_bus_init' was not declared. Should it be static?
drivers/base/bus.c:133:1: warning: symbol 'bus_subsys' was not declared. Should it be static?
drivers/base/bus.c:667:12: warning: symbol 'buses_init' was not declared. Should it be static?
drivers/base/class.c:759:12: warning: symbol 'classes_init' was not declared. Should it be static?
drivers/base/platform.c:313:12: warning: symbol 'platform_bus_init' was not declared. Should it be static?
drivers/base/cpu.c:110:12: warning: symbol 'cpu_dev_init' was not declared. Should it be static?
drivers/base/firmware.c:17:5: warning: symbol 'firmware_register' was not declared. Should it be static?
drivers/base/firmware.c:23:6: warning: symbol 'firmware_unregister' was not declared. Should it be static?
drivers/base/firmware.c:28:12: warning: symbol 'firmware_init' was not declared. Should it be static?
drivers/base/init.c:28:13: warning: symbol 'driver_init' was not declared. Should it be static?
drivers/base/dmapool.c:174:10: warning: implicit cast from nocast type
drivers/base/attribute_container.c:439:1: warning: symbol 'attribute_container_init' was not declared. Should it be static?
drivers/base/power/runtime.c:76:6: warning: symbol 'dpm_set_power_state' was not declared. Should it be static?

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] input core: remove custom-made hotplug handler
Dmitry Torokhov [Thu, 15 Sep 2005 07:01:57 +0000 (02:01 -0500)]
[PATCH] input core: remove custom-made hotplug handler

Input: remove custom-made hotplug handler

Now that all input devices are registered with sysfs we can remove
old custom-made hotplug handler and crate a standard one.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] INPUT: Create symlinks for backwards compatibility
Greg Kroah-Hartman [Fri, 28 Oct 2005 05:25:43 +0000 (22:25 -0700)]
[PATCH] INPUT: Create symlinks for backwards compatibility

This creates symlinks in /sys/class/input/ to the nested class devices
to help userspace cope with the nesting.

Unfortunatly udev still needs to be updated as it can't handle symlinks
properly here :(

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] INPUT: rename input_dev_class to input_class to be correct.
Greg Kroah-Hartman [Fri, 28 Oct 2005 05:25:43 +0000 (22:25 -0700)]
[PATCH] INPUT: rename input_dev_class to input_class to be correct.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] INPUT: remove the input_class structure, as it is unused.
Greg Kroah-Hartman [Fri, 28 Oct 2005 05:25:43 +0000 (22:25 -0700)]
[PATCH] INPUT: remove the input_class structure, as it is unused.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] INPUT: Fix oops when accessing sysfs files of nested input devices
Greg Kroah-Hartman [Fri, 28 Oct 2005 05:25:43 +0000 (22:25 -0700)]
[PATCH] INPUT: Fix oops when accessing sysfs files of nested input devices

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] INPUT: move the input class devices under their new input_dev devices
Greg Kroah-Hartman [Fri, 28 Oct 2005 05:25:43 +0000 (22:25 -0700)]
[PATCH] INPUT: move the input class devices under their new input_dev devices

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] INPUT: export input_dev_class so that input drivers can use it.
Greg Kroah-Hartman [Fri, 28 Oct 2005 05:25:43 +0000 (22:25 -0700)]
[PATCH] INPUT: export input_dev_class so that input drivers can use it.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] INPUT: register the input class device sooner
Greg Kroah-Hartman [Fri, 28 Oct 2005 05:25:43 +0000 (22:25 -0700)]
[PATCH] INPUT: register the input class device sooner

This is needed so we can actually use the class device within the input
handlers.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] Input: export input_dev data via sysfs attributes
Dmitry Torokhov [Thu, 15 Sep 2005 07:01:55 +0000 (02:01 -0500)]
[PATCH] Input: export input_dev data via sysfs attributes

Input: export various input device attributes via sysfs

The following structure is exported:

  input0/
|-- name
|-- phys
|-- uniq
|-- id/{bustype|vendor|product|version}
`-- capabilities/{ev|abs|rel|key|led|msc|ff|sw}

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] Input: show sysfs path in /proc/bus/input/devices
Dmitry Torokhov [Thu, 15 Sep 2005 07:01:54 +0000 (02:01 -0500)]
[PATCH] Input: show sysfs path in /proc/bus/input/devices

Input: show sysfs path in /proc/bus/input/devices

Show that sysfs and phys path are different objects.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] Input: convert sound/ppc/beep to dynamic input_dev allocation
Dmitry Torokhov [Thu, 15 Sep 2005 07:01:49 +0000 (02:01 -0500)]
[PATCH] Input: convert sound/ppc/beep to dynamic input_dev allocation

Input: convert sound/ppc/beep to dynamic input_dev allocation

This is required for input_dev sysfs integration

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] Input: convert net/bluetooth to dynamic input_dev allocation
Dmitry Torokhov [Thu, 15 Sep 2005 07:01:40 +0000 (02:01 -0500)]
[PATCH] Input: convert net/bluetooth to dynamic input_dev allocation

Input: convert net/bluetooth to dynamic input_dev allocation

This is required for input_dev sysfs integration

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] drivers/input/joystick: convert to dynamic input_dev allocation
Dmitry Torokhov [Thu, 15 Sep 2005 07:01:52 +0000 (02:01 -0500)]
[PATCH] drivers/input/joystick: convert to dynamic input_dev allocation

Input: convert drivers/input/joystick to dynamic input_dev allocation

This is required for input_dev sysfs integration

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] Input: convert konicawc to dynamic input_dev allocation
Dmitry Torokhov [Thu, 15 Sep 2005 07:01:42 +0000 (02:01 -0500)]
[PATCH] Input: convert konicawc to dynamic input_dev allocation

Input: convert konicawc to dynamic input_dev allocation

This is required for input_dev sysfs integration

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] Input: convert drivers/macintosh to dynamic input_dev allocation
Dmitry Torokhov [Thu, 15 Sep 2005 07:01:41 +0000 (02:01 -0500)]
[PATCH] Input: convert drivers/macintosh to dynamic input_dev allocation

Input: convert drivers/macntosh to dynamic input_dev allocation

This is required for input_dev sysfs integration

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] drivers/media: convert to dynamic input_dev allocation
Dmitry Torokhov [Thu, 15 Sep 2005 07:01:53 +0000 (02:01 -0500)]
[PATCH] drivers/media: convert to dynamic input_dev allocation

Input: convert drivers/media to dynamic input_dev allocation

This is required for input_dev sysfs integration

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] Input: convert driver/input/misc to dynamic input_dev allocation
Dmitry Torokhov [Thu, 15 Sep 2005 07:01:51 +0000 (02:01 -0500)]
[PATCH] Input: convert driver/input/misc to dynamic input_dev allocation

Input: convert driver/input/misc to dynamic input_dev allocation

This is required for input_dev sysfs integration

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] Input: convert onetouch to dynamic input_dev allocation
Dmitry Torokhov [Thu, 15 Sep 2005 07:01:43 +0000 (02:01 -0500)]
[PATCH] Input: convert onetouch to dynamic input_dev allocation

Input: convert onetouch to dynamic input_dev allocation

This is required for input_dev sysfs integration

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] Input: convert sonypi to dynamic input_dev allocation
Dmitry Torokhov [Thu, 15 Sep 2005 07:01:50 +0000 (02:01 -0500)]
[PATCH] Input: convert sonypi to dynamic input_dev allocation

Input: convert sonypi to dynamic input_dev allocation

This is required for input_dev sysfs integration

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] drivers/input/touchscreen: convert to dynamic input_dev allocation
Dmitry Torokhov [Thu, 15 Sep 2005 07:01:46 +0000 (02:01 -0500)]
[PATCH] drivers/input/touchscreen: convert to dynamic input_dev allocation

Input: convert drivers/input/touchscreen to dynamic input_dev allocation

This is required for input_dev sysfs integration

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] Input: convert ucb1x00-ts to dynamic input_dev allocation
Dmitry Torokhov [Thu, 15 Sep 2005 07:01:48 +0000 (02:01 -0500)]
[PATCH] Input: convert ucb1x00-ts to dynamic input_dev allocation

Input: convert ucb1x00-ts to dynamic input_dev allocation

This is required for input_dev sysfs integration

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] drivers/usb/input: convert to dynamic input_dev allocation
Dmitry Torokhov [Thu, 15 Sep 2005 07:01:47 +0000 (02:01 -0500)]
[PATCH] drivers/usb/input: convert to dynamic input_dev allocation

Input: convert drivers/iusb/input to dynamic input_dev allocation

This is required for input_dev sysfs integration

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] drivers/input/keyboard: convert to dynamic input_dev allocation
Dmitry Torokhov [Thu, 15 Sep 2005 07:01:45 +0000 (02:01 -0500)]
[PATCH] drivers/input/keyboard: convert to dynamic input_dev allocation

Input: convert drivers/input/keyboard to dynamic input_dev allocation

This is required for input_dev sysfs integration

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] drivers/input/mouse: convert to dynamic input_dev allocation
Dmitry Torokhov [Thu, 15 Sep 2005 07:01:44 +0000 (02:01 -0500)]
[PATCH] drivers/input/mouse: convert to dynamic input_dev allocation

Input: convert drivers/input/mouse to dynamic input_dev allocation

This is required for input_dev sysfs integration

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] Input: prepare to sysfs integration
Dmitry Torokhov [Thu, 15 Sep 2005 07:01:39 +0000 (02:01 -0500)]
[PATCH] Input: prepare to sysfs integration

Input: prepare to sysfs integration

Add struct class_device to input_dev; add input_allocate_dev()
to dynamically allocate input devices; dynamically allocated
devices are automatically registered with sysfs.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] Input: kill devfs references
Dmitry Torokhov [Thu, 15 Sep 2005 07:01:38 +0000 (02:01 -0500)]
[PATCH] Input: kill devfs references

Input: remove references to devfs from input subsystem

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] Driver Core: document struct class_device properly
Greg Kroah-Hartman [Fri, 28 Oct 2005 05:25:43 +0000 (22:25 -0700)]
[PATCH] Driver Core: document struct class_device properly

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] Driver Core: fix up all callers of class_device_create()
Greg Kroah-Hartman [Fri, 28 Oct 2005 05:25:43 +0000 (22:25 -0700)]
[PATCH] Driver Core: fix up all callers of class_device_create()

The previous patch adding the ability to nest struct class_device
changed the paramaters to the call class_device_create().  This patch
fixes up all in-kernel users of the function.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] Driver Core: add the ability for class_device structures to be nested
Greg Kroah-Hartman [Fri, 28 Oct 2005 05:25:43 +0000 (22:25 -0700)]
[PATCH] Driver Core: add the ability for class_device structures to be nested

This patch allows struct class_device to be nested, so that another
struct class_device can be the parent of a new one, instead of only
having the struct class be the parent.  This will allow us to
(hopefully) fix up the input and video class subsystem mess.

But please people, don't go crazy and start making huge trees of class
devices, you should only need 2 levels deep to get everything to work
(remember to use a class_interface to get notification of a new class
device being added to the system.)

Oh, this also allows us to have the possibility of potentially, someday,
moving /sys/block into /sys/class.  The main hindrance is that pesky
/dev numberspace issue...

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] add sysfs attr to re-emit device hotplug event
Kay Sievers [Sat, 1 Oct 2005 12:49:43 +0000 (14:49 +0200)]
[PATCH] add sysfs attr to re-emit device hotplug event

A "coldplug + udevstart" can be simple like this:
  for i in /sys/block/*/*/uevent; do echo 1 > $i; done
  for i in /sys/class/*/*/uevent; do echo 1 > $i; done
  for i in /sys/bus/*/devices/*/uevent; do echo 1 > $i; done

Signed-off-by: Kay Sievers <kay.sievers@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] Driver core: pass interface to class interface methods
Dmitry Torokhov [Thu, 15 Sep 2005 07:01:36 +0000 (02:01 -0500)]
[PATCH] Driver core: pass interface to class interface methods

Driver core: pass interface to class intreface methods

Pass interface as argument to add() and remove() class interface
methods. This way a subsystem can implement generic add/remove
handlers and then call interface-specific ones.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] I2O: remove i2o_device_class
Dmitry Torokhov [Thu, 29 Sep 2005 05:40:07 +0000 (00:40 -0500)]
[PATCH] I2O: remove i2o_device_class

I2O: cleanup - remove i2o_device_class

I2O devices reside on their own bus so there should be no reason
to also have i2c_device class that mirros i2o bus.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] I2O: Clean up some pretty bad driver model abuses in the i2o code
Greg Kroah-Hartman [Fri, 28 Oct 2005 05:25:43 +0000 (22:25 -0700)]
[PATCH] I2O: Clean up some pretty bad driver model abuses in the i2o code

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] I2O: remove class interface
Dmitry Torokhov [Thu, 15 Sep 2005 07:01:32 +0000 (02:01 -0500)]
[PATCH] I2O: remove class interface

I2O: remove i2o_device_class_interface misuse

The intent of class interfaces was to provide different
'views' at the same object, not just run some code every
time a new class device is registered. Kill interface
structure, make class core register default attributes
and set up sysfs links right when registering class
devices.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] Driver core: send hotplug event before adding class interfaces
Dmitry Torokhov [Thu, 15 Sep 2005 07:01:37 +0000 (02:01 -0500)]
[PATCH] Driver core: send hotplug event before adding class interfaces

Move call to kobject_hotplug() above code that adds interfaces
to a class device, otherwise children's hotplug events may reach
userspace first.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] usb device wakeup flags
David Brownell [Tue, 13 Sep 2005 02:39:39 +0000 (19:39 -0700)]
[PATCH] usb device wakeup flags

This patch teaches "usb_device" about the new driver model wakeup support:

 - It updates device wakeup capabilities when entering a configuration
   with the WAKEUP attribute;

 - During suspend processing it consults the policy bit to see
   whether it should enable wakeup for that device.  (This resolves
   a FIXME to not assume the answer is always "yes"; some devices
   lie about supporting remote wakeup.)

Support for root hubs and the HCDs is separate (and more complex).

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] driver model wakeup flags
David Brownell [Tue, 13 Sep 2005 02:39:34 +0000 (19:39 -0700)]
[PATCH] driver model wakeup flags

This is a refresh of an earlier patch to add "wakeup" support to the
PM core model.  This provides per-device bus-neutral control of the
use of wakeup events.

  * "struct device_pm_info" has two bits that are initialized as
    part of setting up the enclosing struct device:
      - "can_wakeup", reflecting hardware capabilities
      - "may_wakeup", the policy setting (when CONFIG_PM)

  * There's a writeable sysfs "wakeup" file, with one of two values:
      - "enabled", when the policy is to allow wakeup
      - "disabled", when the policy is not to allow it
      - "" if the device can't currently issue wakeups

By default, wakeup is enabled on all devices that support it.  If its
driver doesn't support it ... treat it as a bug.  :)

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] changes device to driver in porting.txt
Erik Hovland [Thu, 6 Oct 2005 17:47:49 +0000 (10:47 -0700)]
[PATCH] changes device to driver in porting.txt

The document porting.txt in Documentation/driver-model says:
When a device is successfully bound to a device

I think it should say:
When a device is successfully bound to a driver

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] kobject_uevent.c has a typo in a comment
Erik Hovland [Thu, 6 Oct 2005 17:45:30 +0000 (10:45 -0700)]
[PATCH] kobject_uevent.c has a typo in a comment

This patch changes trough to through in a comment in kobject_uevent.c.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] add sysfs support for ide tape
Will Dyson [Fri, 16 Sep 2005 09:55:07 +0000 (02:55 -0700)]
[PATCH] add sysfs support for ide tape

I was recently given an old Travan tape drive and asked to do something
useful with it.  The ide-scsi + st (+serverworks ide controller) combo
results in a hard lockup of the machine which I have not had the energy to
debug, so I turned to ide-tape (which seems to work).  The system in
question debian stable, using udev to manage /dev.

The following patch to ide-tape.c allows udev to create the cdev nodes for
my drive.

Cc: Gadi Oxman <gadio@netvision.net.il>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] aoe: update to version 14
Ed L. Cashin [Thu, 29 Sep 2005 16:47:55 +0000 (12:47 -0400)]
[PATCH] aoe: update to version 14

Signed-off-by: "Ed L. Cashin" <ecashin@coraid.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Update driver version number to 14.

19 years ago[PATCH] aoe: use get_unaligned for accesses in ATA id buffer
Ed L. Cashin [Thu, 29 Sep 2005 16:47:40 +0000 (12:47 -0400)]
[PATCH] aoe: use get_unaligned for accesses in ATA id buffer

Signed-off-by: "Ed L. Cashin" <ecashin@coraid.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Use get_unaligned for possibly-unaligned multi-byte accesses to the
ATA device identify response buffer.

19 years agoMerge master.kernel.org:/home/rmk/linux-2.6-mmc
Linus Torvalds [Fri, 28 Oct 2005 16:25:21 +0000 (09:25 -0700)]
Merge master.kernel.org:/home/rmk/linux-2.6-mmc

19 years agoMerge master.kernel.org:/home/rmk/linux-2.6-arm
Linus Torvalds [Fri, 28 Oct 2005 16:24:22 +0000 (09:24 -0700)]
Merge master.kernel.org:/home/rmk/linux-2.6-arm

Minor manual fixups for gfp_t clashes.

19 years agoAuto-update from upstream
Kyle McMartin [Fri, 28 Oct 2005 16:18:07 +0000 (12:18 -0400)]
Auto-update from upstream

19 years agoMerge branch 'sx8' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6
Linus Torvalds [Fri, 28 Oct 2005 16:16:58 +0000 (09:16 -0700)]
Merge branch 'sx8' of /linux/kernel/git/jgarzik/misc-2.6

19 years agoMerge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
Linus Torvalds [Fri, 28 Oct 2005 16:06:50 +0000 (09:06 -0700)]
Merge branch 'upstream' of /linux/kernel/git/jgarzik/libata-dev

19 years agoMerge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Linus Torvalds [Fri, 28 Oct 2005 16:05:25 +0000 (09:05 -0700)]
Merge branch 'upstream' of /linux/kernel/git/jgarzik/netdev-2.6

19 years agoMerge branch 'elevator-switch' of git://brick.kernel.dk/data/git/linux-2.6-block
Linus Torvalds [Fri, 28 Oct 2005 15:56:34 +0000 (08:56 -0700)]
Merge branch 'elevator-switch' of git://brick.kernel.dk/data/git/linux-2.6-block

Manual fixup for trivial "gfp_t" changes.

19 years agoMerge branch 'generic-dispatch' of git://brick.kernel.dk/data/git/linux-2.6-block
Linus Torvalds [Fri, 28 Oct 2005 15:53:49 +0000 (08:53 -0700)]
Merge branch 'generic-dispatch' of git://brick.kernel.dk/data/git/linux-2.6-block

19 years agoMerge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block
Linus Torvalds [Fri, 28 Oct 2005 15:53:00 +0000 (08:53 -0700)]
Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block

19 years ago[ARM] 3042/1: AAED-2000 - LCD panel informations
Bellido Nicolas [Fri, 28 Oct 2005 15:51:44 +0000 (16:51 +0100)]
[ARM] 3042/1: AAED-2000 - LCD panel informations

Patch from Bellido Nicolas

The AAED-2000 is equiped with an 640x480 LCD.
This adds the parameters that will be passed to the AAEC-2000 platform code.

Signed-off-by: Nicolas Bellido <ml@acolin.be>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
19 years ago[ARM] 3041/1: AAEC-2000 - CLCD controller platform glue
Bellido Nicolas [Fri, 28 Oct 2005 15:51:44 +0000 (16:51 +0100)]
[ARM] 3041/1: AAEC-2000 - CLCD controller platform glue

Patch from Bellido Nicolas

The AAEC-2000 has an ARM PrimeCell PL110 Color LCD Controller.
This patch contains the platform glue that will be used by specific boards.

Signed-off-by: Nicolas Bellido <ml@acolin.be>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
19 years ago[ARM] 3040/1: AAEC-2000 - Preliminary clock interface support
Bellido Nicolas [Fri, 28 Oct 2005 15:51:43 +0000 (16:51 +0100)]
[ARM] 3040/1: AAEC-2000 - Preliminary clock interface support

Patch from Bellido Nicolas

Here is a preliminary clock interface support for the AAEC-2000.

Signed-off-by: Nicolas Bellido <ml@acolin.be>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
19 years ago[ARM] 3039/1: AAEC-2000 - Add MTD support
Bellido Nicolas [Fri, 28 Oct 2005 15:51:42 +0000 (16:51 +0100)]
[ARM] 3039/1: AAEC-2000 - Add MTD support

Patch from Bellido Nicolas

This adds platform code for MTD devices on AAEC-2000.

Signed-off-by: Nicolas Bellido <ml@acolin.be>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
19 years ago[ARM] 3038/1: AAEC-2000 - Proper includes in hardware.h
Bellido Nicolas [Fri, 28 Oct 2005 15:51:41 +0000 (16:51 +0100)]
[ARM] 3038/1: AAEC-2000 - Proper includes in hardware.h

Patch from Bellido Nicolas

linux/config.h is not necessary in hardware.h, while asm/sizes.h and asm/arch//aaec2000.h will be used later.

Signed-off-by: Nicolas Bellido <ml@acolin.be>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
19 years ago[ARM] 3037/1: AAED-2000 - Add defines for GPIO registers on external port.
Bellido Nicolas [Fri, 28 Oct 2005 15:51:40 +0000 (16:51 +0100)]
[ARM] 3037/1: AAED-2000 - Add defines for GPIO registers on external port.

Patch from Bellido Nicolas

The AAED-2000 board has GPIO pins on an external port.
This patch adds the defines, and do the necessary mapping.

Signed-off-by: Nicolas Bellido <ml@acolin.be>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
19 years ago[ARM] 3036/1: AAEC-2000 - Add defines for GPIO registers
Bellido Nicolas [Fri, 28 Oct 2005 15:51:40 +0000 (16:51 +0100)]
[ARM] 3036/1: AAEC-2000 - Add defines for GPIO registers

Patch from Bellido Nicolas

Add defines for GPIO registers on the AAEC-2000 processor.

Signed-off-by: Nicolas Bellido <ml@acolin.be>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
19 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6.15
Linus Torvalds [Fri, 28 Oct 2005 15:50:37 +0000 (08:50 -0700)]
Merge /pub/scm/linux/kernel/git/acme/net-2.6.15

19 years ago[ARM] 2897/2: PXA2xx IRDA support
Nicolas Pitre [Fri, 28 Oct 2005 15:39:33 +0000 (16:39 +0100)]
[ARM] 2897/2: PXA2xx IRDA support

Patch from Nicolas Pitre

This is the PXA2xx common IRDA driver, plus platform support
for Lubbock and Mainstone.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Acked-by: Jean Tourrilhes <jt@hpl.hp.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
19 years ago[ARM] 3035/1: RISCOS compat code fix
Nicolas Pitre [Fri, 28 Oct 2005 15:35:46 +0000 (16:35 +0100)]
[ARM] 3035/1: RISCOS compat code fix

Patch from Nicolas Pitre

From: Daniel Jacobowitz <dan@debian.org>

> I also fixed a bug that confused me greatly while trying to debug: one
> SIGILL has long been a SIGSEGV because of some broken RISCOS
> compatibility code.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
19 years ago[ARM] 3031/1: fix typos in comments of mmc.h
Erik Hovland [Fri, 28 Oct 2005 15:28:04 +0000 (16:28 +0100)]
[ARM] 3031/1: fix typos in comments of mmc.h

Patch from Erik Hovland

I noticed that the same typo (i before c in associated) showed up twice
in the file kernel/include/linux/mmc/mmc.h.

This patch fixes both of the instances I found with this mistake. The
typos are in comments and should have no affect on working code.

E

Signed-off-by: Erik Hovland <erik@hovland.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
19 years ago[ARM] 2921/1: Support for the RTC / nvram on the Comdial MP1000
Jon Ringle [Fri, 28 Oct 2005 15:27:24 +0000 (16:27 +0100)]
[ARM] 2921/1: Support for the RTC / nvram on the Comdial MP1000

Patch from Jon Ringle

This adds support for the RTC and nvram on the Comdial MP1000

Signed-off-by: Jon Ringle
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>