linux-stable.git/drivers/staging/ft1000, branch linux-3.1.y

staging: ft1000_proc needs asm/io.h for inw/outw on sparc

2011-08-02T23:07:51+00:00

Seen during an allmodconfig build for sparc:

  CC [M]  drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.o
In file included from drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c:26:
drivers/staging/ft1000/ft1000-pcmcia/ft1000.h: In function 'ft1000_read_reg':
drivers/staging/ft1000/ft1000-pcmcia/ft1000.h:80: error: implicit declaration of function 'inw'
drivers/staging/ft1000/ft1000-pcmcia/ft1000.h: In function 'ft1000_write_reg':
drivers/staging/ft1000/ft1000-pcmcia/ft1000.h:86: error: implicit declaration of function 'outw'

Signed-off-by: Paul Gortmaker 
Signed-off-by: Greg Kroah-Hartman

Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

2011-07-26T06:26:34+00:00

* 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (741 commits)
  staging:iio:meter:ade7753 should be 16 bit read not 8 bit for mode register.
  staging:iio:kfifo_buf fix double initialization of the ring device structure.
  staging:iio:accel:lis3l02dq: fix incorrect pointer passed to spi_set_drvdata.
  staging:iio:imu fix missing register table index for some channels
  spectra: enable device before poking it
  staging: rts_pstor: Fix a miswriting
  staging/lirc_bt829: Return -ENODEV when no hardware is found.
  staging/lirc_parallel: remove pointless prototypes.
  staging/lirc_parallel: fix panic on rmmod
  staging:iio:adc:ad7476: Incorrect pointer into spi_set_drvdata.
  Staging: zram: Fix kunmapping order
  Revert "gma500: Fix dependencies"
  gma500: Add medfield header
  gma500: wire up the mrst i2c bus from chip_info
  gma500: Fix DPU build
  gma500: Clean up the DPU config and make it runtime
  gma500: resync with Medfield progress
  gma500: Use the mrst helpers and power control for mode commit
  gma500@ Fix backlight range error
  gma500: More Moorestown muddle meddling means MM maybe might modeset
  ...

Fix up fairly trivial conflicts all over, mostly due to header file
cleanup conflicts, but some deleted files and some just context changes:
 - Documentation/feature-removal-schedule.txt
 - drivers/staging/bcm/headers.h
 - drivers/staging/brcm80211/brcmfmac/dhd_linux.c
 - drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
 - drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h
 - drivers/staging/brcm80211/brcmfmac/wl_iw.c
 - drivers/staging/et131x/et131x_netdev.c
 - drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
 - drivers/staging/rtl8192e/r8192E.h
 - drivers/staging/usbip/userspace/src/utils.h

netdevice: Kill 'feature' test macros.

2011-07-12T19:28:58+00:00

Almost all of these have long outstayed their welcome.

And for every one of these macros, there are 10 features for which we
didn't add macros.

Let's just delete them all, and get out of habit of doing things this
way.

Signed-off-by: David S. Miller 
Acked-by: Stephen Hemminger 
Acked-by: Arnd Bergmann

staging: ft1000: Merge common definitions from USB and PCMCIA drivers

2011-07-05T17:33:46+00:00

Merge common definitions from ft1000-usb and ft1000-pcmcia drivers to
a common ft1000.h file.
This revealed two odd things in ft1000-usb which might be bugs so add
comments about them to ft1000_usb.h.

Signed-off-by: Ondrej Zary 
Signed-off-by: Greg Kroah-Hartman

staging: ft1000-pcmcia: remove support for v5 firmware

2011-07-05T17:32:35+00:00

Remove support for v5 firmware images as all known firmware images are v6.

Signed-off-by: Ondrej Zary 
Signed-off-by: Greg Kroah-Hartman

staging: ft1000-pcmcia: remove PSEUDOSZ, use sizeof(struct pseudo_hdr) instead

2011-07-05T17:32:35+00:00

PSEUDOSZ seems to define struct pseudo_hdr size.
Remove it and use sizeof(struct pseudo_hdr) directly.

Signed-off-by: Ondrej Zary 
Signed-off-by: Greg Kroah-Hartman

staging: ft1000-pcmcia: CodingStyle fixes in ft1000.h

2011-07-05T17:32:34+00:00

Major CodingStyle fixes in ft1000.h

Signed-off-by: Ondrej Zary 
Signed-off-by: Greg Kroah-Hartman

staging: ft1000-pcmcia: remove useless ft1000_release() function

2011-07-05T17:32:34+00:00

Remove useless ft1000_release() function.

Signed-off-by: Ondrej Zary 
Signed-off-by: Greg Kroah-Hartman

staging: ft1000-pcmcia: remove unused includes from ft1000_cs.c

2011-07-05T17:32:34+00:00

Remove unused includes from ft1000_cs.c

Signed-off-by: Ondrej Zary 
Signed-off-by: Greg Kroah-Hartman

staging: ft1000-pcmcia: coding style fixes in ft1000_cs.c

2011-07-05T17:32:34+00:00

Minor coding style fixes in ft1000_cs.c

Signed-off-by: Ondrej Zary 
Signed-off-by: Greg Kroah-Hartman