diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-21 01:14:25 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-21 01:14:25 -0700 |
| commit | 87eb367003887cdc81a5d183efea227b5b488961 (patch) | |
| tree | 40f617e25a9364d573e3cd2189c9e7fa56c8a0fe /arch/arm/mach-mx3/mach-pcm037.c | |
| parent | ccb7c7732e2ceb4e81a7806faf1670be9681ccd2 (diff) | |
| parent | 05d17608a69b3ae653ea5c9857283bef3439c733 (diff) | |
| download | kernel_samsung_smdk4412-87eb367003887cdc81a5d183efea227b5b488961.zip kernel_samsung_smdk4412-87eb367003887cdc81a5d183efea227b5b488961.tar.gz kernel_samsung_smdk4412-87eb367003887cdc81a5d183efea227b5b488961.tar.bz2 | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-6000.c
net/core/dev.c
Diffstat (limited to 'arch/arm/mach-mx3/mach-pcm037.c')
| -rw-r--r-- | arch/arm/mach-mx3/mach-pcm037.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-mx3/mach-pcm037.c b/arch/arm/mach-mx3/mach-pcm037.c index 034ec81..2df1ec5 100644 --- a/arch/arm/mach-mx3/mach-pcm037.c +++ b/arch/arm/mach-mx3/mach-pcm037.c @@ -35,7 +35,6 @@ #include <linux/can/platform/sja1000.h> #include <linux/usb/otg.h> #include <linux/usb/ulpi.h> -#include <linux/fsl_devices.h> #include <linux/gfp.h> #include <media/soc_camera.h> |