diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-07-18 15:53:06 +0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-07-18 15:53:06 +0400 |
commit | 61eab000f3536f080eab43fd5eed3fd817ded76e (patch) | |
tree | d1448b3b90c5650b522c8d13d8bdd7bd65a5cf52 /arch/arm/mach-kirkwood/board-iconnect.c | |
parent | 68e67f40b7343383517c3f951b4b8db7626406bc (diff) | |
parent | 4e01ec636e64707d202a1ca21a47bbc6d53085b7 (diff) | |
download | linux-61eab000f3536f080eab43fd5eed3fd817ded76e.tar.xz |
Merge branch 'topic/hda' into for-next
This is a large chunk merge for 3.6 HD-audio things
Diffstat (limited to 'arch/arm/mach-kirkwood/board-iconnect.c')
-rw-r--r-- | arch/arm/mach-kirkwood/board-iconnect.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-kirkwood/board-iconnect.c b/arch/arm/mach-kirkwood/board-iconnect.c index 2222c5739519..b0d3cc49269d 100644 --- a/arch/arm/mach-kirkwood/board-iconnect.c +++ b/arch/arm/mach-kirkwood/board-iconnect.c @@ -20,9 +20,6 @@ #include <linux/mv643xx_eth.h> #include <linux/gpio.h> #include <linux/leds.h> -#include <linux/spi/flash.h> -#include <linux/spi/spi.h> -#include <linux/spi/orion_spi.h> #include <linux/i2c.h> #include <linux/input.h> #include <linux/gpio_keys.h> |