diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2010-01-22 13:04:18 +0100 |
|---|---|---|
| committer | Lars-Peter Clausen <lars@metafoo.de> | 2010-01-22 13:04:18 +0100 |
| commit | 045da0e232795ff0637ee1c38a9822c9b823f4e7 (patch) | |
| tree | 84cfef86485bafe0ffc9698f57b9e108d4262736 /arch/arm/mach-s3c2442/gta02-pm-bt.c | |
| parent | b7aba0ffec6c26230c452b8970903850009b4e73 (diff) | |
| parent | 3c4a1161634e1b425c9f1154b1935c6b9f422394 (diff) | |
Merge branch 'gta02-machine-2.6.32' into gta02-machine-devices-2.6.32
Conflicts:
arch/arm/mach-s3c2442/include/mach/gta02.h
arch/arm/mach-s3c2442/mach-gta02.c
Diffstat (limited to 'arch/arm/mach-s3c2442/gta02-pm-bt.c')
| -rw-r--r-- | arch/arm/mach-s3c2442/gta02-pm-bt.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2442/gta02-pm-bt.c b/arch/arm/mach-s3c2442/gta02-pm-bt.c index 76671ce96d0..8bb2a12f7c5 100644 --- a/arch/arm/mach-s3c2442/gta02-pm-bt.c +++ b/arch/arm/mach-s3c2442/gta02-pm-bt.c @@ -23,7 +23,6 @@ #include <asm/mach-types.h> #include <mach/gta02.h> -#include <linux/mfd/pcf50633/gpio.h> #include <linux/regulator/consumer.h> |